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

Merge branch 'develop' into standalone_develop

Browse Source
This commit is contained in:
yystopf
2022-03-22 10:45:45 +08:00
parent 4cc8dd70f4 bc639488aa
commit d796d59557
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/gitea/client_service.rb
+1 -1
View File
@@ -82,7 +82,7 @@ class Gitea::ClientService < ApplicationService
req.headers['Content-Type'] = 'application/json'
req.response :logger # 显示日志
req.adapter Faraday.default_adapter
req.options.timeout = 100 # open/read timeout in seconds
req.options.timeout = 1200 # open/read timeout in seconds
req.options.open_timeout = 10 # connection open timeout in seconds
if token.blank?
req.basic_auth(username, secret)
app/services/issues/list_query_service.rb
+4 -4
View File
@@ -27,12 +27,12 @@ class Issues::ListQueryService < ApplicationService
issues = issues.joins(:pull_request).where(pull_requests: {status: 1})
end
if search_name.present?
issues = issues.where("subject LIKE ? OR description LIKE ? ", "%#{search_name}%", "%#{search_name}%")
end
# if search_name.present?
# issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%")
# end
if start_time&.present? || end_time&.present?
issues = issues.where("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)
end
issues = issues.where(author_id: params[:author_id]) if params[:author_id].present? && params[:author_id].to_s != "all"