diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-08-08 10:57:34 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-08 10:57:34 +0000 |
| commit | 0f77d24be8fd0969528716b84c4909a0efd71255 (patch) | |
| tree | 8e8e528f4781e90d5c903dda80ad4ac8d2d2701a /app/views/projects | |
| parent | 6aa56a70270001323f85791aec205cce5558501f (diff) | |
| download | gitlab-ce-0f77d24be8fd0969528716b84c4909a0efd71255.tar.gz | |
Keep project settings sections expanded after submitting form
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/edit.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/update.js.haml | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index f483fad6142..30544dde451 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -15,6 +15,7 @@ .settings-content .project-edit-errors = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f| + %input{ name: 'update_section', type: 'hidden', value: 'js-general-project-settings' } %fieldset .row .form-group.col-md-9 @@ -75,6 +76,7 @@ Enable or disable certain project features and choose access levels. .settings-content = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "sharing-permissions-form" }, authenticity_token: true do |f| + %input{ name: 'update_section', type: 'hidden', value: 'js-shared-permissions' } -# haml-lint:disable InlineJavaScript %script.js-project-permissions-form-data{ type: "application/json" }= project_permissions_panel_data(@project) .js-project-permissions-form @@ -94,6 +96,7 @@ = render_if_exists 'shared/promotions/promote_mr_features' = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form" }, authenticity_token: true do |f| + %input{ name: 'update_section', type: 'hidden', value: 'js-merge-request-settings' } = render 'projects/merge_request_settings', form: f = f.submit 'Save changes', class: "btn btn-save qa-save-merge-request-changes" diff --git a/app/views/projects/update.js.haml b/app/views/projects/update.js.haml index 1a353953838..e8681da6528 100644 --- a/app/views/projects/update.js.haml +++ b/app/views/projects/update.js.haml @@ -1,6 +1,7 @@ - if @project.valid? :plain - location.href = "#{edit_project_path(@project)}"; + location.href = "#{edit_project_path(@project, anchor: params[:update_section])}"; + location.reload(); - else :plain $(".project-edit-errors").html("#{escape_javascript(render('errors'))}"); |