Merge branch 'fix_visibility_level' into 'master'
Fix visibility level on new project page Closes #19253 See merge request !9885
This commit is contained in:
commit
3735266d84
|
@ -1,5 +1,6 @@
|
||||||
- page_title 'New Project'
|
- page_title 'New Project'
|
||||||
- header_title "Projects", dashboard_projects_path
|
- header_title "Projects", dashboard_projects_path
|
||||||
|
- visibility_level = params.dig(:project, :visibility_level) || default_project_visibility
|
||||||
|
|
||||||
.project-edit-container
|
.project-edit-container
|
||||||
.project-edit-errors
|
.project-edit-errors
|
||||||
|
@ -95,7 +96,7 @@
|
||||||
= f.label :visibility_level, class: 'label-light' do
|
= f.label :visibility_level, class: 'label-light' do
|
||||||
Visibility Level
|
Visibility Level
|
||||||
= link_to icon('question-circle'), help_page_path("public_access/public_access")
|
= link_to icon('question-circle'), help_page_path("public_access/public_access")
|
||||||
= render 'shared/visibility_level', f: f, visibility_level: default_project_visibility, can_change_visibility_level: true, form_model: @project, with_label: false
|
= render 'shared/visibility_level', f: f, visibility_level: visibility_level.to_i, can_change_visibility_level: true, form_model: @project, with_label: false
|
||||||
|
|
||||||
= f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4
|
= f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4
|
||||||
= link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel'
|
= link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel'
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Fix visibility level on new project page
|
||||||
|
merge_request: 9885
|
||||||
|
author: blackst0ne
|
|
@ -16,6 +16,15 @@ feature "New project", feature: true do
|
||||||
|
|
||||||
expect(find_field("project_visibility_level_#{level}")).to be_checked
|
expect(find_field("project_visibility_level_#{level}")).to be_checked
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'saves visibility level on validation error' do
|
||||||
|
visit new_project_path
|
||||||
|
|
||||||
|
choose(key)
|
||||||
|
click_button('Create project')
|
||||||
|
|
||||||
|
expect(find_field("project_visibility_level_#{level}")).to be_checked
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue