kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Move visibility_level check for forked projects to Project model

Browse source
This commit is contained in:
Tomasz Maczukin 2015-11-03 16:37:39 +01:00
parent 77ef4855e0
commit d2846293d0
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/visibility_level_helper.rb
View file

@ -89,7 +89,6 @@ module VisibilityLevelHelper
def skip_level?(form_model, level)
form_model.is_a?(Project) &&
form_model.forked? &&
!Gitlab::VisibilityLevel.allowed_fork_levels(form_model.forked_from_project.visibility_level).include?(level)
!form_model.visibility_level_allowed?(level)
end
end

5
app/models/project.rb
View file

@ -783,4 +783,9 @@ class Project < ActiveRecord::Base
service.active = true
service.save
end
def visibility_level_allowed?(level)
return true unless forked?
Gitlab::VisibilityLevel.allowed_fork_levels(forked_from_project.visibility_level).include?(level)
end
end