From a3fd5411198f95fd77124e9a513f48a09ac23196 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 22 May 2015 10:15:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=82=AE=E4=BB=B6=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E6=96=B0=E7=94=A8=E6=88=B7=E3=80=81=E5=B7=B2=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb |  6 +++---
 app/helpers/account_helper.rb          | 12 ++++++++++++
 app/models/mailer.rb                   |  8 ++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c79d0862f..536ea6bba 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -247,9 +247,9 @@ class ProjectsController < ApplicationController
     # 1、自动注册
     # 2、加入项目、创建角色
     # 3、用户得分
-    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)
+    if params[:mail]
+      Member.create(:role_ids => [4], :user_id => params[:user],:project_id => params[:id])
+      UserGrade.create(:user_id =>params[:user], :project_id => params[:id])
     end
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
diff --git a/app/helpers/account_helper.rb b/app/helpers/account_helper.rb
index 7ad6fe65b..827557a40 100644
--- a/app/helpers/account_helper.rb
+++ b/app/helpers/account_helper.rb
@@ -47,6 +47,18 @@ module AccountHelper
     user
   end
 
+  # 自动创建一个新用户，但是初始状态是锁定的
+  def automatically_register_lock(user, &block)
+    user.lock
+    user.last_login_on = Time.now
+    if user.save
+      UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
+    else
+      yield if block_given?
+    end
+    user
+  end
+
   def administrator_manually__register(user, &block)
     if user.save
       UserStatus.create(:user_id => user.id ,:changsets_count => 0, :watchers_count => 0)
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 7756b7e27..2c3a94874 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -58,14 +58,10 @@ class Mailer < ActionMailer::Base
     us = UsersService.new
     # 自动激活用户
     user = us.register_auto(login, @email, @password)
-
-    Member.create(:role_ids => [4], :user_id => user.id,:project_id => project.id)
-    UserGrade.create(:user_id => user.id, :project_id => project.id)
     User.current = user unless User.current.nil?
     @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
-                           )
+    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :user => user.id, :mail => true, :token => @token.value)
     mail :to => email, :subject => @subject
   end
 
@@ -77,7 +73,7 @@ class Mailer < ActionMailer::Base
     @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)
+    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :user => user.id, :mail => true, :token => @token.value)
     mail :to => email, :subject => @subject
   end