Browse Source

Merge branch 'develop' into standalone_develop

pull/313/head
yystopf 4 years ago
parent
commit
fde01e62ef
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      app/services/issues/list_query_service.rb

+ 3
- 3
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})
end

# if search_name.present?
# issues = issues.where("issues.subject LIKE ? OR issues.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("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)


Loading…
Cancel
Save