diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-04 12:52:17 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-04 12:52:17 +0400 |
commit | c283fba3b7e9fb89ae2ed77597adee2700982718 (patch) | |
tree | 32abc3407cf38e9db36ed89ae81bfac8ce093366 /app | |
parent | 5921c7481302913bffe88788c354f415cd19df82 (diff) |
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 <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r-- | app/models/ability.rb | 8 | ||||
-rw-r--r-- | app/models/project_team.rb | 16 |
2 files changed, 20 insertions, 4 deletions
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) |