Commit a89c590ffef54c9ff4c790b5d91a8afe68b1ee42
1 parent
c283fba3
Exists in
spb-stable
and in
2 other branches
Prevent exceptions for methods like ProjectTeam#developer? if no membership exists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
4 additions
and
4 deletions
Show diff stats
app/models/project_team.rb
| @@ -118,19 +118,19 @@ class ProjectTeam | @@ -118,19 +118,19 @@ class ProjectTeam | ||
| 118 | end | 118 | end |
| 119 | 119 | ||
| 120 | def guest?(user) | 120 | def guest?(user) |
| 121 | - find_tm(user.id).access_field == Gitlab::Access::GUEST | 121 | + find_tm(user.id).try(:access_field) == Gitlab::Access::GUEST |
| 122 | end | 122 | end |
| 123 | 123 | ||
| 124 | def reporter?(user) | 124 | def reporter?(user) |
| 125 | - find_tm(user.id).access_field == Gitlab::Access::REPORTER | 125 | + find_tm(user.id).try(:access_field) == Gitlab::Access::REPORTER |
| 126 | end | 126 | end |
| 127 | 127 | ||
| 128 | def developer?(user) | 128 | def developer?(user) |
| 129 | - find_tm(user.id).access_field == Gitlab::Access::DEVELOPER | 129 | + find_tm(user.id).try(:access_field) == Gitlab::Access::DEVELOPER |
| 130 | end | 130 | end |
| 131 | 131 | ||
| 132 | def master?(user) | 132 | def master?(user) |
| 133 | - find_tm(user.id).access_field == Gitlab::Access::MASTER | 133 | + find_tm(user.id).try(:access_field) == Gitlab::Access::MASTER |
| 134 | end | 134 | end |
| 135 | 135 | ||
| 136 | private | 136 | private |