Merge branch 'develop' into standalone_develop
This commit is contained in:
commit
4dbb416143
|
@ -29,3 +29,4 @@ json.has_trace_user @user.trace_user.present?
|
|||
json.is_new @user.login.present? && params[:login].to_s.include?("#{@user.login}")
|
||||
json.nps EduSetting.get("nps-on-off-switch").to_s == 'true' && UserNp.where(user_id: current_user.id).where("created_at >= ?", (Time.now - 30.days).beginning_of_day ).blank?
|
||||
json.open_blockchain EduSetting.get("open_blockchain_users").to_s.split(",").include?(@user.id.to_s) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(@user.login)
|
||||
json.sign_cla @user.sign_cla
|
||||
|
|
Loading…
Reference in New Issue