ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 15:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "rename context to serialization_context and add url helpers"

Browse Source
This commit is contained in:
L. Preston Sego III
2015-10-29 08:16:47 -04:00
parent a063cbea21
commit 17be650538
7 changed files with 7 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/active_model/serializer/adapter/json_api.rb
View File

@@ -206,7 +206,7 @@ module ActiveModel
end
def links_for(serializer, options)
JsonApi::PaginationLinks.new(serializer.object, options[:serialization_context]).serializable_hash(options)
JsonApi::PaginationLinks.new(serializer.object, options[:context]).serializable_hash(options)
end
end
end

6
lib/active_model/serializer/adapter/json_api/pagination_links.rb
View File

@@ -41,11 +41,11 @@ module ActiveModel
end
def url(options)
@url ||= options.fetch(:links, {}).fetch(:self, nil) || request_url
@url ||= options.fetch(:links, {}).fetch(:self, nil) || original_url
end
def request_url
@request_url ||= context.request_url
def original_url
@original_url ||= context.original_url[/\A[^?]+/]
end
def query_parameters