Skip to content
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

Jump to bottom

categories are retrieved based on site_id #559

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

categories are retrieved based on site_id #559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion app/controllers/categories_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ def subcategories
end

def index
categories = Category.order(:name)
# categories = Category.order(:name)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove if no longer necessary.

# Cast:
# nil and '' -> nil
# '0', 'false', 'False', 'f', etc. -> false
# Almost everything else -> true
categories = if params[:site_id]
Site.find(params[:site_id]).categories
else
Site.find(0).categories #sfsg
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sfsg is not necessarily site_id 0 - a safer way would be using find_by(site_code: 'sfsg').

end

top_level = ActiveRecord::Type::Boolean.new.cast(params[:top_level])
categories = categories.where(top_level: top_level) unless top_level.nil?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we preserve the previous commented-out behavior by ordering by name after filtering by site?

render json: CategoryPresenter.present(categories)
Expand Down