From 1b5c41b3ad696d3f0fce9ef569ef553f7adaf53e Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 27 May 2015 17:40:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 2 +- app/services/users_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 787b1b050..d570c238e 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class WelcomeController < ApplicationController - layout "base_welcome" + # layout "base_welcome" include ApplicationHelper include WelcomeHelper helper :project_score diff --git a/app/services/users_service.rb b/app/services/users_service.rb index 7d7976bb5..1121c98b4 100644 --- a/app/services/users_service.rb +++ b/app/services/users_service.rb @@ -62,7 +62,7 @@ class UsersService else @user.password = "" end - @user = automatically_register(@user) + @user = automatically_register_lock(@user) if @user.id != nil ue = @user.user_extensions ||= UserExtensions.new ue.user_id = @user.id