diff options
author | http://jneen.net/ <jneen@jneen.net> | 2017-03-01 00:08:07 +0300 |
---|---|---|
committer | http://jneen.net/ <jneen@jneen.net> | 2017-03-09 22:49:52 +0300 |
commit | 846e581732e291f8927d04a5b1b40fe8f2688885 (patch) | |
tree | 50e0a538e26ac47f37ba68f93898185608c09096 /app/models | |
parent | 130fd255bc0735d4175f2db2770a9092882fa3a4 (diff) |
use a magic default :global symbol instead of nil
to make sure we mean the global permissions
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/ability.rb | 7 | ||||
-rw-r--r-- | app/models/guest.rb | 2 | ||||
-rw-r--r-- | app/models/user.rb | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index ad6c588202e..f3692a5a067 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -56,15 +56,16 @@ class Ability end end - def allowed?(user, action, subject) + def allowed?(user, action, subject = :global) allowed(user, subject).include?(action) end - def allowed(user, subject) + def allowed(user, subject = :global) + return BasePolicy::RuleSet.none if subject.nil? return uncached_allowed(user, subject) unless RequestStore.active? user_key = user ? user.id : 'anonymous' - subject_key = subject ? "#{subject.class.name}/#{subject.id}" : 'global' + subject_key = subject == :global ? 'global' : "#{subject.class.name}/#{subject.id}" key = "/ability/#{user_key}/#{subject_key}" RequestStore[key] ||= uncached_allowed(user, subject).freeze end diff --git a/app/models/guest.rb b/app/models/guest.rb index 01285ca1264..df287c277a7 100644 --- a/app/models/guest.rb +++ b/app/models/guest.rb @@ -1,6 +1,6 @@ class Guest class << self - def can?(action, subject) + def can?(action, subject = :global) Ability.allowed?(nil, action, subject) end end diff --git a/app/models/user.rb b/app/models/user.rb index 76fb4cd470e..db3837ecdf2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -563,14 +563,14 @@ class User < ActiveRecord::Base end def can_create_group? - can?(:create_group, nil) + can?(:create_group) end def can_select_namespace? several_namespaces? || admin end - def can?(action, subject) + def can?(action, subject = :global) Ability.allowed?(self, action, subject) end |