mirror of
https://gitlink.org.cn/Gitlink/forgeplus.git
synced 2026-05-03 03:40:49 +08:00
Merge pull request 'FIX user complete bug' (#165) from develop into dev_trustie_server
This commit is contained in:
@@ -247,11 +247,11 @@ class ApplicationController < ActionController::Base
|
||||
end
|
||||
|
||||
def require_profile_completed
|
||||
tip_exception(411, "请完善资料后再操作") unless User.current.profile_completed
|
||||
tip_exception(411, "请完善资料后再操作") unless User.current.profile_is_completed?
|
||||
end
|
||||
|
||||
def require_user_profile_completed(user)
|
||||
tip_exception(412, "请用户完善资料后再操作") unless user.profile_completed
|
||||
tip_exception(412, "请用户完善资料后再操作") unless user.profile_is_completed?
|
||||
end
|
||||
|
||||
# 异常提醒
|
||||
@@ -280,7 +280,7 @@ class ApplicationController < ActionController::Base
|
||||
|
||||
# 资料是否完善
|
||||
def check_account
|
||||
if !current_user.profile_completed?
|
||||
if !current_user. profile_is_completed?
|
||||
#info_url = '/account/profile'
|
||||
tip_exception(402, nil)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user