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

Merge branch 'pre_trustie_server' into trustie_server

This commit is contained in:
xiaoxiaoqiong 2022-04-06 20:33:05 +08:00
parent d67c6f2f76 f082819496
commit 62a1e6730c
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/services/issues/list_query_service.rb
View File

@ -27,9 +27,9 @@ class Issues::ListQueryService < ApplicationService
issues = issues.joins(:pull_request).where(pull_requests: {status: 1}) issues = issues.joins(:pull_request).where(pull_requests: {status: 1})
end end
# if search_name.present? if search_name.present?
# issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%") issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%")
# end end
if start_time&.present? || end_time&.present? if start_time&.present? || end_time&.present?
issues = issues.where("issues.start_date between ? and ?",start_time&.present? ? start_time.to_date : Time.now.to_date, end_time&.present? ? end_time.to_date : Time.now.to_date) issues = issues.where("issues.start_date between ? and ?",start_time&.present? ? start_time.to_date : Time.now.to_date, end_time&.present? ? end_time.to_date : Time.now.to_date)

20
app/views/users/_user_small.json.jbuilder
View File

@ -1,9 +1,11 @@
# 单表存储的信息可以放里面 # 单表存储的信息可以放里面
json.array! users do |user| json.array! users do |user|
json.username user.full_name json.username user.full_name
json.login user.login json.login user.login
json.user_id user.id json.user_id user.id
json.image_url url_to_avatar(user) json.mail user.mail
json.profile_completed user.profile_completed json.custom_department user.custom_department
end json.image_url url_to_avatar(user)
json.profile_completed user.profile_completed
end