Skip to content

Issue #496 - Plan search issues.#3023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briri merged 2 commits into from
Sep 9, 2021
Merged

Issue #496 - Plan search issues. #3023

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de99557
Issue #496 - Plan search issues.
Sep 1, 2021
b0b8f4b
Merge branch 'development' into bug_496_search_dashboard_and_other_di…
briri Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/plan.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,13 +169,13 @@ class Plan < ApplicationRecord
scope :search, lambda { |term|
if date_range?(term: term)
joins(:template, roles: [user: :org])
.where(Role.creator_condition)
.where(roles: { active: true })
.by_date_range(:created_at, term)
else
search_pattern = "%#{term}%"
joins(:template, roles: [user: :org])
.left_outer_joins(:identifiers, :contributors)
.where(Role.creator_condition)
.where(roles: { active: true })
.where("lower(plans.title) LIKE lower(:search_pattern)
OR lower(orgs.name) LIKE lower (:search_pattern)
OR lower(orgs.abbreviation) LIKE lower (:search_pattern)
Expand Down