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

Fix error reported by Flay

Browse source
This commit is contained in:
Rubén Dávila 2017-08-30 18:38:06 -05:00
parent 8ffbab216b
commit 68de5dcba2
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/helpers/visibility_level_helper.rb
View file

@ -89,11 +89,10 @@ module VisibilityLevelHelper
end
unless project.visibility_level_allowed_by_group?(level)
group = link_to project.group.name, group_path(project.group)
change_visiblity = link_to 'change the visibility', edit_group_path(project.group)
errors = visibility_level_errors_for_group(project.group, level_name)
reasons << "the visibility of #{group} is #{project.group.visibility}"
instructions << " To make this project #{level_name}, you must first #{change_visiblity} of the parent group."
reasons << errors[:reason]
instructions << errors[:instruction]
end
reasons = reasons.any? ? ' because ' + reasons.to_sentence : ''
@ -116,11 +115,10 @@ module VisibilityLevelHelper
end
unless group.visibility_level_allowed_by_parent?(level)
parent_group = link_to group.parent.name, group_path(group.parent)
change_visiblity = link_to 'change the visibility', edit_group_path(group.parent)
errors = visibility_level_errors_for_group(group.parent, level_name)
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."
reasons << errors[:reason]
instructions << errors[:instruction]
end
reasons = reasons.any? ? ' because ' + reasons.to_sentence : ''
@ -163,4 +161,14 @@ module VisibilityLevelHelper
return false unless form_model.respond_to?(:visibility_level_allowed?)
!form_model.visibility_level_allowed?(level)
end
private
def visibility_level_errors_for_group(group, level_name)
group = link_to group.name, group_path(group)
change_visiblity = link_to 'change the visibility', edit_group_path(group)
{ reason: "the visibility of #{group} is #{group.visibility}",
instruction: " To make this group #{level_name}, you must first #{change_visiblity} of the parent group." }
end
end