|
|
|
|
@ -107,16 +107,6 @@ class AccountController < ApplicationController
|
|
|
|
|
@user = User.new(:language => current_language.to_s)
|
|
|
|
|
else
|
|
|
|
|
user_params = params[:user] || {}
|
|
|
|
|
#@user = User.new
|
|
|
|
|
#@user.safe_attributes = user_params
|
|
|
|
|
#if params[:identity] == "2" # 2 企业
|
|
|
|
|
# firstname_code = @user.firstname
|
|
|
|
|
# lastname_code = @user.lastname
|
|
|
|
|
# @user.firstname = params[:enterprise_name]
|
|
|
|
|
# @user.lastname = l(:field_enterprise)
|
|
|
|
|
#end
|
|
|
|
|
#@user.admin = false
|
|
|
|
|
#@user.register
|
|
|
|
|
if session[:auth_source_registration]
|
|
|
|
|
@user.activate
|
|
|
|
|
@user.login = session[:auth_source_registration][:login]
|
|
|
|
|
@ -128,9 +118,9 @@ class AccountController < ApplicationController
|
|
|
|
|
redirect_to my_account_path
|
|
|
|
|
end
|
|
|
|
|
else
|
|
|
|
|
us = UsersService.new
|
|
|
|
|
@user = us.register user_params.merge(:should_confirmation_password => true)
|
|
|
|
|
case Setting.self_registration
|
|
|
|
|
us = UsersService.new
|
|
|
|
|
@user = us.register user_params.merge(:should_confirmation_password => true)
|
|
|
|
|
case Setting.self_registration
|
|
|
|
|
when '1'
|
|
|
|
|
#register_by_email_activation(@user)
|
|
|
|
|
unless @user.new_record?
|
|
|
|
|
@ -139,7 +129,7 @@ class AccountController < ApplicationController
|
|
|
|
|
when '3'
|
|
|
|
|
#register_automatically(@user)
|
|
|
|
|
unless @user.new_record?
|
|
|
|
|
self.logged_user = user
|
|
|
|
|
self.logged_user = @user
|
|
|
|
|
flash[:notice] = l(:notice_account_activated)
|
|
|
|
|
redirect_to my_account_url
|
|
|
|
|
end
|
|
|
|
|
@ -148,37 +138,7 @@ class AccountController < ApplicationController
|
|
|
|
|
unless @user.new_record?
|
|
|
|
|
account_pending
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
# @user.login = params[:user][:login]
|
|
|
|
|
# unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
|
|
|
|
|
# @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
|
|
|
|
|
# end
|
|
|
|
|
#
|
|
|
|
|
#
|
|
|
|
|
#
|
|
|
|
|
# case Setting.self_registration
|
|
|
|
|
# when '1'
|
|
|
|
|
# register_by_email_activation(@user)
|
|
|
|
|
# when '3'
|
|
|
|
|
# register_automatically(@user)
|
|
|
|
|
# else
|
|
|
|
|
# register_manually_by_administrator(@user)
|
|
|
|
|
# end
|
|
|
|
|
#
|
|
|
|
|
# #added by bai
|
|
|
|
|
# if @user.id != nil
|
|
|
|
|
# ue = @user.user_extensions ||= UserExtensions.new
|
|
|
|
|
# #ue = UserExtensions.create(:identity => params[:identity].to_i,:technical_title => params[:technical_title], :gender => params[:gender].to_i, :user_id => @user.id, :student_id => )
|
|
|
|
|
# ue.identity = params[:identity].to_i
|
|
|
|
|
# ue.technical_title = params[:technical_title]
|
|
|
|
|
# ue.gender = params[:gender].to_i
|
|
|
|
|
# ue.user_id = @user.id
|
|
|
|
|
# ue.student_id = params[:no]
|
|
|
|
|
# ue.location = params[:province] if params[:province] != nil
|
|
|
|
|
# ue.location_city = params[:city] if params[:city] != nil
|
|
|
|
|
# ue.save
|
|
|
|
|
# end
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
