diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-06 04:44:42 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-06-06 04:44:42 -0500 |
| commit | d9c67a709be457457373ca87b015e846044bfff6 (patch) | |
| tree | ee8658c022d2ce4dd2350227e133928e32691980 | |
| parent | 2c11cab38c85a15b6f8f950d8c614fe601e51933 (diff) | |
| download | gitlab-ce-d9c67a709be457457373ca87b015e846044bfff6.tar.gz | |
show/hide the extra auto devops settings when appropriate
| -rw-r--r-- | app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js | 13 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/_autodevops_form.html.haml | 8 |
2 files changed, 17 insertions, 4 deletions
diff --git a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js index 6c2a785c0af..6d227177cb4 100644 --- a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js +++ b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js @@ -22,4 +22,17 @@ document.addEventListener('DOMContentLoaded', () => { errorBox: variableListEl.querySelector('.js-ci-variable-error-box'), saveEndpoint: variableListEl.dataset.saveEndpoint, }); + + // hide extra auto devops settings based on data-attributes + const autoDevOpsSettings = document.querySelectorAll('input[data-hide-extra-settings]'); + const autoDevOpsExtraSettings = document.querySelector('.js-extra-settings'); + + autoDevOpsSettings.forEach(input => { + input.addEventListener('click', () => + autoDevOpsExtraSettings.classList.toggle( + 'hidden', + input.dataset.hideExtraSettings === 'true', + ), + ); + }); }); diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml index 96399433e07..4c25635be6f 100644 --- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml +++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml @@ -13,7 +13,7 @@ .card .card-body .form-check - = form.radio_button :enabled, 'true', class: 'form-check-input' + = form.radio_button :enabled, 'true', class: 'form-check-input', data: { hide_extra_settings: false } = form.label :enabled_true, class: 'form-check-label' do %strong= s_('CICD|Enable Auto DevOps') .form-text.text-muted @@ -22,13 +22,13 @@ .card .card-body .form-check - = form.radio_button :enabled, '', class: 'form-check-input' + = form.radio_button :enabled, '', class: 'form-check-input', data: { hide_extra_settings: false } = form.label :enabled_, class: 'form-check-label' do %strong= s_('CICD|Instance default (%{state})') % { state: "#{Gitlab::CurrentSettings.auto_devops_enabled? ? _('enabled') : _('disabled')}" } .form-text.text-muted = s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted } - .card + .card.js-extra-settings{ class: form.object.enabled == false ? 'hidden' : nil } .card-body.bg-light = form.label :domain do %strong= _('Domain') @@ -42,7 +42,7 @@ .card .card-body .form-check - = form.radio_button :enabled, 'false', class: 'form-check-input' + = form.radio_button :enabled, 'false', class: 'form-check-input', data: { hide_extra_settings: true } = form.label :enabled_false, class: 'form-check-label' do %strong= s_('CICD|Disable Auto DevOps') .form-text.text-muted |