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.

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

Remove order in before_action callback #2784

Merged
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions app/controllers/alchemy/admin/pages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ class PagesController < ResourcesController

helper "alchemy/pages"

before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link]
before_action :load_resource, except: [:index, :flush, :new, :create, :copy_language_tree, :link]

authorize_resource class: Alchemy::Page, except: [:index, :tree]

before_action only: [:index, :tree, :flush, :new, :order, :create, :copy_language_tree] do
before_action only: [:index, :tree, :flush, :new, :create, :copy_language_tree] do
authorize! :index, :alchemy_admin_pages
end

Expand All @@ -21,7 +21,7 @@ class PagesController < ResourcesController
except: [:show]

before_action :set_root_page,
only: [:index, :show, :order]
only: [:index, :show]

before_action :set_preview_mode, only: [:show]

Expand Down