kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Minor refactoring

This commit is contained in:
Douwe Maan 2015-11-17 16:24:02 +01:00
parent 16438ad205
commit 756d61562b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/ability.rb
View File

@ -2,7 +2,7 @@ class Ability
class << self
def allowed(user, subject)
return not_auth_abilities(user, subject) if user.nil?
return [] unless user.kind_of?(User)
return [] unless user.is_a?(User)
return [] if user.blocked?
case subject.class.name
@ -22,14 +22,20 @@ class Ability
# List of possible abilities
# for non-authenticated user
def not_auth_abilities(user, subject)
return not_auth_personal_snippet_abilities(subject) if subject.kind_of?(PersonalSnippet)
return not_auth_project_abilities(subject) if subject.kind_of?(Project) || subject.respond_to?(:project)
return not_auth_group_abilities(subject) if subject.kind_of?(Group) || subject.respond_to?(:group)
[]
case true
when subject.is_a?(PersonalSnippet)
not_auth_personal_snippet_abilities(subject)
when subject.is_a?(Project) || subject.respond_to?(:project)
not_auth_project_abilities(subject)
when subject.is_a?(Group) || subject.respond_to?(:group)
not_auth_group_abilities(subject)
else
[]
end
end
def not_auth_project_abilities(subject)
project = if subject.kind_of?(Project)
project = if subject.is_a?(Project)
subject
else
subject.project
@ -57,7 +63,7 @@ class Ability
end
def not_auth_group_abilities(subject)
group = if subject.kind_of?(Group)
group = if subject.is_a?(Group)
subject
else
subject.group
@ -327,7 +333,7 @@ class Ability
end
if snippet.public? || snippet.internal?
rules.push(:read_personal_snippet)
rules << :read_personal_snippet
end
rules