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

models: fix exception in api_attributes.

Browse Source 
Fixup bug in eacb4d4df when calling `api_attributes` on an object that
doesn't have a policy (its policy inherited from ApplicationPolicy).
This commit is contained in:
evazion
2020-06-10 18:16:58 -05:00
parent 8a2ae91ff2
commit 45b3370d49
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/application_record.rb
View File

@@ -54,7 +54,8 @@ class ApplicationRecord < ActiveRecord::Base
# XXX deprecated, shouldn't expose this as an instance method. # XXX deprecated, shouldn't expose this as an instance method.
def api_attributes(user: CurrentUser.user) def api_attributes(user: CurrentUser.user)
Pundit.policy!([user, nil], self).api_attributes policy = Pundit.policy([user, nil], self) || ApplicationPolicy.new([user, nil], self)
policy.api_attributes
end end
def html_data_attributes def html_data_attributes

5
test/functional/artist_urls_controller_test.rb
View File

@@ -8,6 +8,11 @@ class ArtistUrlsControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
end end
should "render for a json request" do
get artist_urls_path, as: :json
assert_response :success
end
should "render for a complex search" do should "render for a complex search" do
@artist = FactoryBot.create(:artist, name: "bkub", url_string: "-http://bkub.com") @artist = FactoryBot.create(:artist, name: "bkub", url_string: "-http://bkub.com")