Skip to content

Issue #496 - Fix for search bug of Plans on the "My Dashboard". #3000

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

Closed
johnpinto1 wants to merge 4 commits into from
Closed

Issue #496 - Fix for search bug of Plans on the "My Dashboard". #3000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
861af32
Issue #496 - Fix for search bug of Plans on the "My Dashboard".
Aug 12, 2021
3c0ed2e
Merge branch 'development' into bug_496_not-possible_to_search_throug…
briri Aug 19, 2021
095743e
Merge branch 'development' into bug_496_not-possible_to_search_throug…
briri Aug 24, 2021
37387c1
Merge branch 'development' into bug_496_not-possible_to_search_throug…
raycarrick-ed Aug 25, 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
2 changes: 1 addition & 1 deletion app/controllers/paginable/plans_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def org_admin_other_user

paginable_renderise(
partial: "org_admin_other_user",
scope: Plan.active(@user),
scope: Plan.active(@user).where(Role.creator_condition),
query_params: { sort_field: "plans.updated_at", sort_direction: :desc }
)
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/public_pages_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def template_export
# GET /plans_index
# ------------------------------------------------------------------------------------
def plan_index
@plans = Plan.publicly_visible.includes(:template)
@plans = Plan.where(Role.creator_condition).publicly_visible.includes(:template)
render "plan_index", locals: {
query_params: {
page: paginable_params.fetch(:page, 1),
Expand Down
2 changes: 0 additions & 2 deletions app/models/plan.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,11 @@ class Plan < ApplicationRecord
scope :search, lambda { |term|
if date_range?(term: term)
joins(:template, roles: [user: :org])
.where(Role.creator_condition)
.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("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