Inline controller's permitted_attributes method
#465
Merged
Conversation
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
Fixes #417 Problem: If users include the Pundit gem on an Administrate controller, the controller attempts to call the `permitted_attributes` method defined by pundit instedad of the one defined by Administrate. Because these methods take different arguments, this results in an `ArgumentError` for the user. Solution: Inline the `permitted_attributes` method to avoid the method name collision. This narrows the public API a bit, but that's alright. The user can accomplish all of the removed functionality by overriding the parent `resource_params` method.
|
@nickcharlton Take a look at this one. Seems ready to go |
|
Agreed; going to merge this. |
fwolfst
pushed a commit
to fwolfst/administrate
that referenced
this pull request
Mar 8, 2017
Fixes thoughtbot#417 Problem: If users include the Pundit gem on an Administrate controller, the controller attempts to call the `permitted_attributes` method defined by pundit instedad of the one defined by Administrate. Because these methods take different arguments, this results in an `ArgumentError` for the user. Solution: Inline the `permitted_attributes` method to avoid the method name collision. This narrows the public API a bit, but that's alright. The user can accomplish all of the removed functionality by overriding the parent `resource_params` method.
fc-arny
pushed a commit
to fc-arny/rc16
that referenced
this pull request
May 18, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #417
Problem:
If users include the Pundit gem on an Administrate controller, the controller attempts to call the
permitted_attributesmethod defined by pundit instedad of the one defined by Administrate.Because these methods take different arguments, this results in an
ArgumentErrorfor the user.Solution:
Inline the
permitted_attributesmethod to avoid the method name collision.This narrows the public API a bit, but that's alright. The user can accomplish all of the removed functionality by overriding the parent
resource_paramsmethod.