Commit a5444564 authored by Rémy Coutable's avatar Rémy Coutable

Fix memoization and rename #owner to #owner?

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent dc26a76e
...@@ -4,9 +4,9 @@ class ProjectPolicy < BasePolicy ...@@ -4,9 +4,9 @@ class ProjectPolicy < BasePolicy
def rules def rules
team_access!(user) team_access!(user)
owner_access! if user.admin? || owner owner_access! if user.admin? || owner?
auditor_access! if user.auditor? auditor_access! if user.auditor?
team_member_owner_access! if owner team_member_owner_access! if owner?
if project.public? || (project.internal? && !user.external?) if project.public? || (project.internal? && !user.external?)
guest_access! guest_access!
...@@ -26,8 +26,10 @@ class ProjectPolicy < BasePolicy ...@@ -26,8 +26,10 @@ class ProjectPolicy < BasePolicy
@subject @subject
end end
def owner def owner?
@owner ||= project.owner == user || return @owner if defined?(@owner)
@owner = project.owner == user ||
(project.group && project.group.has_owner?(user)) (project.group && project.group.has_owner?(user))
end end
...@@ -279,7 +281,7 @@ class ProjectPolicy < BasePolicy ...@@ -279,7 +281,7 @@ class ProjectPolicy < BasePolicy
def access_requestable? def access_requestable?
project.request_access_enabled && project.request_access_enabled &&
!owner && !owner? &&
!user.admin? && !user.admin? &&
!project.team.member?(user) && !project.team.member?(user) &&
!project_group_member?(user) !project_group_member?(user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment