diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-03-19 14:19:38 +0000 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-03-19 16:05:29 +0100 |
| commit | 37dd88acbb25204292c32d50b15e60c64c93c823 (patch) | |
| tree | e467535ed6c1445cb641f78716be4daad67e4196 | |
| parent | c7491c0b764b11eadf9a55735b44f45100353182 (diff) | |
| download | gitlab-ce-37dd88acbb25204292c32d50b15e60c64c93c823.tar.gz | |
Merge branch 'sh-fix-ssh-pull-mirorrs-ce' into 'master'
Backport EE JavaScript changes for SSH pull mirrors
Closes #56340
See merge request gitlab-org/gitlab-ce!26308
| -rw-r--r-- | app/assets/javascripts/mirrors/ssh_mirror.js | 8 | ||||
| -rw-r--r-- | app/views/projects/mirrors/_authentication_method.html.haml | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/mirrors/ssh_mirror.js b/app/assets/javascripts/mirrors/ssh_mirror.js index 5bdf5d6277a..547c078ec55 100644 --- a/app/assets/javascripts/mirrors/ssh_mirror.js +++ b/app/assets/javascripts/mirrors/ssh_mirror.js @@ -20,6 +20,7 @@ export default class SSHMirror { this.$btnDetectHostKeys = this.$form.find('.js-detect-host-keys'); this.$btnSSHHostsShowAdvanced = this.$form.find('.btn-show-advanced'); this.$dropdownAuthType = this.$form.find('.js-mirror-auth-type'); + this.$hiddenAuthType = this.$form.find('.js-hidden-mirror-auth-type'); this.$wellAuthTypeChanging = this.$form.find('.js-well-changing-auth'); this.$wellPasswordAuth = this.$form.find('.js-well-password-auth'); @@ -167,6 +168,7 @@ export default class SSHMirror { this.$wellPasswordAuth.collapse('hide'); this.$wellSSHAuth.collapse('hide'); + this.updateHiddenAuthType(selectedAuthType); // This request should happen only if selected Auth type was SSH // and SSH Public key was not present on page load @@ -234,6 +236,12 @@ export default class SSHMirror { toggleAuthWell(authType) { this.$wellPasswordAuth.collapse(authType === AUTH_METHOD.PASSWORD ? 'show' : 'hide'); this.$wellSSHAuth.collapse(authType === AUTH_METHOD.SSH ? 'show' : 'hide'); + this.updateHiddenAuthType(authType); + } + + updateHiddenAuthType(authType) { + this.$hiddenAuthType.val(authType); + this.$hiddenAuthType.prop('disabled', authType === AUTH_METHOD.SSH); } /** diff --git a/app/views/projects/mirrors/_authentication_method.html.haml b/app/views/projects/mirrors/_authentication_method.html.haml index 293a2e3ebfe..ef6db07a1bb 100644 --- a/app/views/projects/mirrors/_authentication_method.html.haml +++ b/app/views/projects/mirrors/_authentication_method.html.haml @@ -9,6 +9,7 @@ = f.select :auth_method, options_for_select(auth_options, mirror.auth_method), {}, { class: "form-control js-mirror-auth-type qa-authentication-method" } + = f.hidden_field :auth_method, value: "password", class: "js-hidden-mirror-auth-type" .form-group .collapse.js-well-changing-auth |