diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-12 14:48:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 14:48:06 +0100 |
| commit | 237c70d3cdd9dd87ef7594c4015fdfa7151cb5e5 (patch) | |
| tree | d4e1dacf3c0d0e107e5136e4ecb5ff55af989a69 /core | |
| parent | 859dd1e742c4c71b3fbd7035a866c230b80142c2 (diff) | |
| parent | 85c708c3ed3a5b97c6c09159c939256399f73cda (diff) | |
| download | nextcloud-server-237c70d3cdd9dd87ef7594c4015fdfa7151cb5e5.tar.gz nextcloud-server-237c70d3cdd9dd87ef7594c4015fdfa7151cb5e5.zip | |
Merge pull request #12409 from nextcloud/admin-vue-approval-fix
Use nextcloud-password-confirmation
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/js.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index 026cc6bb0d6..79f268ea6c9 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1751,7 +1751,7 @@ OC.PasswordConfirmation = { /** * @param {function} callback */ - requirePasswordConfirmation: function(callback, options) { + requirePasswordConfirmation: function(callback, options, rejectCallback) { options = typeof options !== 'undefined' ? options : {}; var defaults = { title: t('core','Authentication required'), @@ -1775,6 +1775,8 @@ OC.PasswordConfirmation = { function (result, password) { if (result && password !== '') { self._confirmPassword(password, config); + } else if (_.isFunction(rejectCallback)) { + rejectCallback() } }, true, |