修改新用户注册不弹出试用申请

dev_bj
SylorHuang 6 years ago
parent 90fa990de6
commit 47a7e16631

@ -24,7 +24,7 @@ class AccountController < ApplicationController
skip_before_filter :check_if_login_required
skip_before_filter :check_authentication, :only => [:login, :logout, :user_join, :avatar, :authentication, :professional_certification, :security_settings, :change_psd, :user_info]
before_filter :auth_login1, :only => [:avatar, :authentication, :professional_certification, :security_settings, :change_psd, :reset_psd, :user_info]
skip_before_filter :verify_authenticity_token, :only =>[:codepedia_login, :login, :register]
# skip_before_filter :verify_authenticity_token, :only =>[:codepedia_login, :login, :register]
before_filter :require_login, only: [:avatar, :authentication, :professional_certification, :security_settings, :change_psd, :user_info, :user_auth, :apply_auth, :apply_pro_certification, :check_student_id,
:bind_email, :change_or_bind]
include ApplicationHelper
@ -422,6 +422,7 @@ class AccountController < ApplicationController
end
end
end
# @user.update()
end
# 注册完后绑定邮箱(可选)
@ -556,6 +557,7 @@ class AccountController < ApplicationController
else
redirect_to my_account_url
end
@user.update_attributes(:certification => 1)
return
else
@user.login = lg

@ -124,14 +124,14 @@
<% end %>
<% notice = SystemUpdateNotice.last %>
<% if @noticed_update || ((User.current.certification == 1 || params[:controller] != "welcome") && notice.present? && notice.end_time > Time.now && notice.start_time >= (Time.now - 21600) && User.current.user_system_notices.where(:notice_type => notice.notice_type).count == 0) %>
var htmlvalue = "<%= escape_javascript(render :partial => 'account/user_update_notice', :locals => {:notice => notice})%>";
pop_box_new(htmlvalue, 500, 380);
<% UserSystemNotice.create(:user_id => User.current.id, :notice_type => notice.notice_type) %>
<%# notice = SystemUpdateNotice.last %>
<%# if @noticed_update || ((User.current.certification == 1 || params[:controller] != "welcome") && notice.present? && notice.end_time > Time.now && notice.start_time >= (Time.now - 21600) && User.current.user_system_notices.where(:notice_type => notice.notice_type).count == 0) %>
<!-- var htmlvalue = "<%= escape_javascript(render :partial => 'account/user_update_notice', :locals => {:notice => notice})%>";-->
<!-- pop_box_new(htmlvalue, 500, 380);-->
<%# UserSystemNotice.create(:user_id => User.current.id, :notice_type => notice.notice_type) %>
<%# elsif notice.present? && notice.end_time < Time.now %>
<%# notice.destroy %>
<% end %>
<%# end %>
});
</script>

@ -0,0 +1 @@
Subproject commit cbd5fc14d0fb14ddc4e2358bec569df035af642d
Loading…
Cancel
Save