From 76b4ae24dac2171c41e6e24de3d5c090b3dc81dd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 30 Apr 2015 16:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7--=E9=82=AE=E4=BB=B6=E5=90=8D=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E5=90=8C=E6=84=8F?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=90=8E=E6=89=8D=E8=83=BD=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb |  7 +++----
 app/models/mailer.rb                   | 14 +++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 2b58f1265..96807d2dc 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -247,10 +247,9 @@ class ProjectsController < ApplicationController
     # 1、自动注册
     # 2、加入项目、创建角色
     # 3、用户得分
-    if params[:login]
-      # 自动激活用户
-      user.status = 1
-      user.save
+    if params[:email]
+      user = User.find_by_mail(params[:email].to_s)
+      Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id)
     end
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index d35374fcf..e2ccb2230 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -71,14 +71,14 @@ class Mailer < ActionMailer::Base
 
   # 邀请已注册的用户加入项目
   def request_member_to_project(email, project, invitor)
+    @subject = "#{invitor.name} #{l(:label_invite_project)}: #{project.name} "
     user = User.find_by_mail(email.to_s)
-      Member.create(:role_ids => [4], :user_id => user.id,:project_id => project.id)
-      @invitor_name = "#{invitor.name}"
-      @project_name = "#{project.name}"
-      @user = user
-      @token = Token.get_token_from_user(user, 'autologin')
-      @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,:user => user, :token => @token.value)
-      mail :to => email, :invitor_name => "#{@invitor_name}", :project_name => "#{@project_name}"
+    @invitor_name = "#{invitor.name}"
+    @project_name = "#{project.name}"
+    @user = user
+    @token = Token.get_token_from_user(user, 'autologin')
+    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :email => email, :token => @token.value)
+    mail :to => email, :subject => @subject
   end
 
   # author: alan