diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2015-11-03 19:23:19 +0300 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2015-11-03 19:23:19 +0300 |
| commit | 9e1db139eb1387fa9658ed68592d93eca61efb6b (patch) | |
| tree | 5ad5ecc3d838b2a67155e2b10c7227353eb648da | |
| parent | d2846293d067cdf38d2816768e059d901a960a22 (diff) | |
Move level_name resolving to Gitlan::VisibilityLevel
| -rw-r--r-- | app/services/base_service.rb | 5 | ||||
| -rw-r--r-- | lib/gitlab/visibility_level.rb | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/services/base_service.rb b/app/services/base_service.rb index f00ec7408b6..b48ca67d4d2 100644 --- a/app/services/base_service.rb +++ b/app/services/base_service.rb @@ -39,10 +39,7 @@ class BaseService def deny_visibility_level(model, denied_visibility_level = nil) denied_visibility_level ||= model.visibility_level - level_name = 'Unknown' - Gitlab::VisibilityLevel.options.each do |name, level| - level_name = name if level == denied_visibility_level - end + level_name = Gitlab::VisibilityLevel.level_name(denied_visibility_level) model.errors.add( :visibility_level, diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb index 335dc44be19..d0ffe24f827 100644 --- a/lib/gitlab/visibility_level.rb +++ b/lib/gitlab/visibility_level.rb @@ -51,6 +51,15 @@ module Gitlab def allowed_fork_levels(origin_level) [PRIVATE, INTERNAL, PUBLIC].select{ |level| level <= origin_level } end + + def level_name(level) + level_name = 'Unknown' + options.each do |name, lvl| + level_name = name if lvl == level + end + + level_name + end end def private? |