From c283fba3b7e9fb89ae2ed77597adee2700982718 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 4 Jun 2014 11:52:17 +0300 Subject: Improve performance of application for large teams This commit fixes a lot of sql queries to db for for groups and projects with big amount of members. Signed-off-by: Dmitriy Zaporozhets --- app/models/ability.rb | 8 ++++---- app/models/project_team.rb | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/models/ability.rb b/app/models/ability.rb index 70c26caded8..df9b210dfca 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -71,16 +71,16 @@ class Ability team = project.team # Rules based on role in project - if team.masters.include?(user) + if team.master?(user) rules += project_master_rules - elsif team.developers.include?(user) + elsif team.developer?(user) rules += project_dev_rules - elsif team.reporters.include?(user) + elsif team.reporter?(user) rules += project_report_rules - elsif team.guests.include?(user) + elsif team.guest?(user) rules += project_guest_rules end diff --git a/app/models/project_team.rb b/app/models/project_team.rb index eca13e56061..639f78dcd3f 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -117,6 +117,22 @@ class ProjectTeam false end + def guest?(user) + find_tm(user.id).access_field == Gitlab::Access::GUEST + end + + def reporter?(user) + find_tm(user.id).access_field == Gitlab::Access::REPORTER + end + + def developer?(user) + find_tm(user.id).access_field == Gitlab::Access::DEVELOPER + end + + def master?(user) + find_tm(user.id).access_field == Gitlab::Access::MASTER + end + private def fetch_members(level = nil) -- cgit v1.2.3 From a89c590ffef54c9ff4c790b5d91a8afe68b1ee42 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 4 Jun 2014 12:56:03 +0300 Subject: Prevent exceptions for methods like ProjectTeam#developer? if no membership exists Signed-off-by: Dmitriy Zaporozhets --- app/models/project_team.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/models/project_team.rb b/app/models/project_team.rb index 639f78dcd3f..cc8bb60aac4 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -118,19 +118,19 @@ class ProjectTeam end def guest?(user) - find_tm(user.id).access_field == Gitlab::Access::GUEST + find_tm(user.id).try(:access_field) == Gitlab::Access::GUEST end def reporter?(user) - find_tm(user.id).access_field == Gitlab::Access::REPORTER + find_tm(user.id).try(:access_field) == Gitlab::Access::REPORTER end def developer?(user) - find_tm(user.id).access_field == Gitlab::Access::DEVELOPER + find_tm(user.id).try(:access_field) == Gitlab::Access::DEVELOPER end def master?(user) - find_tm(user.id).access_field == Gitlab::Access::MASTER + find_tm(user.id).try(:access_field) == Gitlab::Access::MASTER end private -- cgit v1.2.3