floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-03 03:40:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into standalone_develop

Browse Source 
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
This commit is contained in:
“xxq250”
2022-08-30 18:14:17 +08:00
parent 1613cf7376 4b7c58b13f
commit d51bb7030f
26 changed files with 928 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/users/get_user_info.json.jbuilder
View File

@@ -26,4 +26,5 @@ json.super_description @user.super_description
json.(@user, :show_email, :show_department, :show_location, :show_super_description)
json.message_unread_total @message_unread_total
json.has_trace_user @user.trace_user.present?
json.is_new @user.login.present? && params[:login].to_s.include?("#{@user.login}")
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?