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

fixed 用户名称统一用昵称

Browse Source
This commit is contained in:
xxq250
2022-11-28 16:56:46 +08:00
parent 66a1be944a
commit f818a3ac91
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/user.rb
View File

@@ -560,17 +560,19 @@ class User < Owner
def full_name def full_name
return '游客' unless logged? return '游客' unless logged?
name = show_realname? ? lastname + firstname : nickname # name = show_realname? ? lastname + firstname : nickname
name.blank? ? (nickname.blank? ? login : nickname) : name # name.blank? ? (nickname.blank? ? login : nickname) : name
nickname.blank? ? login : nickname
end end
# 用户的真实姓名（不考虑用户是否隐藏了真实姓名，课堂模块都用真实姓名） # 用户的真实姓名（不考虑用户是否隐藏了真实姓名，课堂模块都用真实姓名）
def real_name def real_name
return '游客' unless logged? return '游客' unless logged?
name = lastname + firstname # name = lastname + firstname
name = name.blank? ? (nickname.blank? ? login : nickname) : name # name = name.blank? ? (nickname.blank? ? login : nickname) : name
# name.gsub(/\s+/, '').strip #6.11 -hs # name.gsub(/\s+/, '').strip #6.11 -hs
name.strip # name.strip
nickname.blank? ? login : nickname
end end
def only_real_name def only_real_name