jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle include param for as_json and to_xml

Browse Source
This commit is contained in:
Albert Yi
2019-04-18 12:54:11 -07:00
parent a12f6badde
commit 0daa8184d4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/application_record.rb
View File

@@ -150,6 +150,8 @@ class ApplicationRecord < ActiveRecord::Base
def as_json(options = {}) def as_json(options = {})
options ||= {} options ||= {}
options[:include] ||= []
options[:except] ||= [] options[:except] ||= []
options[:except] += hidden_attributes options[:except] += hidden_attributes
@@ -166,6 +168,7 @@ class ApplicationRecord < ActiveRecord::Base
if options[:only] if options[:only]
options[:methods] = options[:methods] & options[:only] options[:methods] = options[:methods] & options[:only]
options[:include] = options[:include] & options[:only]
end end
super(options) super(options)
@@ -174,6 +177,8 @@ class ApplicationRecord < ActiveRecord::Base
def to_xml(options = {}, &block) def to_xml(options = {}, &block)
options ||= {} options ||= {}
options[:include] ||= []
options[:except] ||= [] options[:except] ||= []
options[:except] += hidden_attributes options[:except] += hidden_attributes
@@ -190,6 +195,7 @@ class ApplicationRecord < ActiveRecord::Base
if options[:only] if options[:only]
options[:methods] = options[:methods] & options[:only] options[:methods] = options[:methods] & options[:only]
options[:include] = options[:include] & options[:only]
end end
super(options, &block) super(options, &block)