floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge from develop

This commit is contained in:
yystopf 2022-06-08 10:38:10 +08:00
parent 15a0b85ae6 8ae5587516
commit 8a7dc75907
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/message_template/custom_tip.rb
View File

@ -61,6 +61,7 @@ class MessageTemplate::CustomTip < MessageTemplate
end end
title.gsub!('{platform}', PLATFORM) title.gsub!('{platform}', PLATFORM)
content.gsub!('{platform}', PLATFORM) content.gsub!('{platform}', PLATFORM)
content.gsub!('{baseurl}', base_url)
return title, content return title, content
rescue => e rescue => e

2
app/models/user.rb
View File

@ -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)}