forked from Gitlink/forgeplus
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
This commit is contained in:
commit
43792d3100
|
@ -181,7 +181,7 @@ class User < Owner
|
||||||
scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
|
scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
|
||||||
scope :like, lambda { |keywords|
|
scope :like, lambda { |keywords|
|
||||||
sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search"
|
sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search"
|
||||||
where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
|
where(sql, :search => "%#{keywords.strip}%") unless keywords.blank?
|
||||||
}
|
}
|
||||||
|
|
||||||
scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname, :gitea_uid, :type)}
|
scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname, :gitea_uid, :type)}
|
||||||
|
@ -567,7 +567,8 @@ class User < Owner
|
||||||
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
|
||||||
end
|
end
|
||||||
|
|
||||||
def only_real_name
|
def only_real_name
|
||||||
|
|
Loading…
Reference in New Issue