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

expand the help text with links and additional instructions

Browse source
This commit is contained in:
Mike Greiling 2017-08-26 02:43:45 -05:00
parent 3488e8f011
commit 0a8d0924fe
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/project_visibility.js
View file

@ -3,7 +3,7 @@ function setVisibilityOptions(namespaceSelector) {
return;
}
const selectedNamespace = namespaceSelector.options[namespaceSelector.selectedIndex];
const { name, visibility, visibilityLevel } = selectedNamespace.dataset;
const { name, visibility, visibilityLevel, showPath, editPath } = selectedNamespace.dataset;
document.querySelectorAll('.visibility-level-setting .radio').forEach((option) => {
const optionInput = option.querySelector('input[type=radio]');
@ -18,7 +18,11 @@ function setVisibilityOptions(namespaceSelector) {
optionInput.disabled = true;
const reason = option.querySelector('.option-disabled-reason');
if (reason) {
reason.innerText = `This project cannot be ${optionName} because the visibility of ${name} is ${visibility}.`;
reason.innerHTML =
`This project cannot be ${optionName} because the visibility of
<a href="${showPath}">${name}</a> is ${visibility}. To make this project
${optionName}, you must first <a href="${editPath}">change the visibility</a>
of the parent group.`;
}
} else {
option.classList.remove('disabled');

9
app/helpers/namespaces_helper.rb
View file

@ -41,7 +41,14 @@ module NamespacesHelper
elements = namespaces.sort_by(&:human_name).map! do |n|
[display_path ? n.full_path : n.human_name, n.id,
data: { options_parent: type, visibility_level: n.visibility_level_value, visibility: n.visibility, name: n.name }]
data: {
options_parent: type,
visibility_level: n.visibility_level_value,
visibility: n.visibility,
name: n.name,
show_path: n.is_a?(Group) ? group_path(n) : user_path(n),
edit_path: n.is_a?(Group) ? edit_group_path(n) : nil
}]
end
[type.camelize, elements]