glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make synapse policy resilient to nil topic1/topic2/map

Browse source
This commit is contained in:
Devin Howard 2016-10-25 11:32:20 +08:00
parent 0442b3e56c
commit 496a15a836
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/policies/synapse_policy.rb
View file

@ -45,17 +45,17 @@ class SynapsePolicy < ApplicationPolicy
def topic1_show? def topic1_show?
@topic1_policy ||= Pundit.policy(user, record.topic1) @topic1_policy ||= Pundit.policy(user, record.topic1)
@topic1_policy.show? @topic1_policy&.show?
end end
def topic2_show? def topic2_show?
@topic2_policy ||= Pundit.policy(user, record.topic2) @topic2_policy ||= Pundit.policy(user, record.topic2)
@topic2_policy.show? @topic2_policy&.show?
end end
def synapse_show? def synapse_show?
if record.defer_to_map.present? if record.defer_to_map.present?
map_policy.show? map_policy&.show?
else else
record.permission == 'commons' || record.permission == 'public' || record.user == user record.permission == 'commons' || record.permission == 'public' || record.user == user
end end