diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-03-19 17:19:38 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-03-19 17:19:38 +0300 |
| commit | 645653a49eaafccab3276f52fdfbfaa5c3e3c540 (patch) | |
| tree | fe032efbbd021dfda3269e2bbd926766fdbac866 /app/assets | |
| parent | d3c4c5d048fc4be14260662541ef65347cad0849 (diff) | |
| parent | d1a89b27f493e71da74f60d620210bdb460bfbd6 (diff) | |
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
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/mirrors/ssh_mirror.js | 8 |
1 files changed, 8 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); } /** |