-
-
Notifications
You must be signed in to change notification settings - Fork 122
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
Use new access denied extension point. #12
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
27 changes: 6 additions & 21 deletions
27
lib/controllers/backend/spree/admin/admin_controller_decorator.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,11 @@ | ||
Spree::Admin::BaseController.class_eval do | ||
|
||
# Redirect as appropriate when an access request fails. The default action is to redirect to the login screen. | ||
# Override this method in your controllers if you want to have special behavior in case the user is not authorized | ||
# to access the requested action. For example, a popup window might simply close itself. | ||
def unauthorized | ||
if try_spree_current_user | ||
flash[:error] = Spree.t(:authorization_failure) | ||
redirect_to spree.admin_unauthorized_path | ||
else | ||
store_location | ||
redirect_to spree.admin_login_path | ||
end | ||
end | ||
|
||
protected | ||
|
||
def model_class | ||
const_name = controller_name.classify | ||
if Spree.const_defined?(const_name, false) | ||
return "Spree::#{const_name}".constantize | ||
end | ||
nil | ||
def model_class | ||
const_name = controller_name.classify | ||
if Spree.const_defined?(const_name, false) | ||
return "Spree::#{const_name}".constantize | ||
end | ||
|
||
nil | ||
end | ||
end |
3 changes: 0 additions & 3 deletions
3
lib/controllers/backend/spree/admin/admin_resource_controller_decorator.rb
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i'm still curious why this is here as opposed to in core, though that's not central to what you're doing here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Neither am I. Wanted to limit the number of changes in this pull-request so I didn't spend any time looking into whether this is even necessary.