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

enhance disabled group visibility options with links and instructions

Browse source
This commit is contained in:
Mike Greiling 2017-08-30 16:01:57 -05:00
parent 8a72203a58
commit 129823664b
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/helpers/visibility_level_helper.rb
View file

@ -105,6 +105,7 @@ module VisibilityLevelHelper
def disallowed_group_visibility_level_description(level, group)
level_name = Gitlab::VisibilityLevel.level_name(level).downcase
reasons = []
instructions = ''
unless group.visibility_level_allowed_by_projects?(level)
reasons << "it contains projects with higher visibility"
@ -115,11 +116,15 @@ module VisibilityLevelHelper
end
unless group.visibility_level_allowed_by_parent?(level)
reasons << "the visibility of its parent group is #{group.parent.visibility}"
parent_group = link_to group.parent.name, group_path(group.parent)
change_visiblity = link_to 'change the visibility', edit_group_path(group.parent)
reasons << "the visibility of #{parent_group} is #{group.parent.visibility}"
instructions << " To make this group #{level_name}, you must first #{change_visiblity} of the parent group."
end
reasons = reasons.any? ? ' because ' + reasons.to_sentence : ''
"This group cannot be #{level_name}#{reasons}."
"This group cannot be #{level_name}#{reasons}.#{instructions}".html_safe
end
def visibility_icon_description(form_model)

4
spec/helpers/visibility_level_helper_spec.rb
View file

@ -132,8 +132,8 @@ describe VisibilityLevelHelper do
.to include "it contains projects with higher visibility", "it contains sub-groups with higher visibility"
expect(disallowed_visibility_level?(subgroup, Gitlab::VisibilityLevel::PUBLIC)).to be_truthy
expect(disallowed_visibility_level_description(Gitlab::VisibilityLevel::PUBLIC, subgroup))
.to include "the visibility of its parent group is internal"
expect(strip_tags disallowed_visibility_level_description(Gitlab::VisibilityLevel::PUBLIC, subgroup))
.to include "the visibility of #{group.name} is internal"
end
end
end