Skip to content

Fix relation_name lambda being broken #81

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

Merged
merged 2 commits into from
Sep 12, 2017
Merged

Fix relation_name lambda being broken #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8f5f2c
Fix context not being passed properly in PunditScopedResource
valscion Aug 31, 2017
8b47794
Always pass a hash with :context key to relation_name accessor
valscion Aug 31, 2017
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
4 changes: 2 additions & 2 deletions lib/jsonapi/authorization/authorizing_processor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def authorize_include_item(resource_klass, source_record, include_item)
next_resource_klass = relationship.resource_klass
Array.wrap(
source_record.public_send(
relationship.relation_name(context)
relationship.relation_name(context: context)
)
).each do |next_source_record|
deep.each do |next_include_item|
Expand All @@ -364,7 +364,7 @@ def authorize_include_item(resource_klass, source_record, include_item)
case relationship
when JSONAPI::Relationship::ToOne
related_record = source_record.public_send(
relationship.relation_name(context)
relationship.relation_name(context: context)
)
return if related_record.nil?
authorizer.include_has_one_resource(source_record, related_record)
Expand Down
2 changes: 1 addition & 1 deletion lib/jsonapi/authorization/pundit_scoped_resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def records_for(association_name)

def fetch_relationship(association_name)
relationships = self.class._relationships.select do |_k, v|
v.relation_name({}) == association_name
v.relation_name(context: context) == association_name
end
if relationships.empty?
nil
Expand Down