diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-04-06 18:46:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 18:46:30 +0300 |
| commit | aabcb043f3827156d53d21f646dd7878be642abf (patch) | |
| tree | a271a4d3ab10d910f01deb85dcc07d975f316930 | |
| parent | 125c0eb30e26de9717b92fba83967237de5b692e (diff) | |
| parent | c5d980788c09192156591483217949288ef3338b (diff) | |
Merge pull request #4236 from nextcloud/backport-3827-remove-double-password-confirmation
[stable11] Remove the double password confirmation on changing cron
| -rw-r--r-- | core/js/public/appconfig.js | 1 | ||||
| -rw-r--r-- | settings/js/admin.js | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/js/public/appconfig.js b/core/js/public/appconfig.js index d84ddaab404..bba39c8b805 100644 --- a/core/js/public/appconfig.js +++ b/core/js/public/appconfig.js @@ -38,6 +38,7 @@ OCP.AppConfig = { return; } + options = options || {}; $.ajax({ type: method.toUpperCase(), url: OC.linkToOCS('apps/provisioning_api/api/v1', 2) + 'config/apps' + endpoint, diff --git a/settings/js/admin.js b/settings/js/admin.js index 094b12b2bab..985e318e34b 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -46,9 +46,12 @@ $(document).ready(function(){ if($(this).is(':checked')){ var mode = $(this).val(); if (mode === 'ajax' || mode === 'webcron' || mode === 'cron') { - OCP.AppConfig.setValue('core', 'backgroundjobs_mode', mode); - // clear cron errors on background job mode change - OCP.AppConfig.deleteKey('core', 'cronErrors'); + OCP.AppConfig.setValue('core', 'backgroundjobs_mode', mode, { + success: function() { + // clear cron errors on background job mode change + OCP.AppConfig.deleteKey('core', 'cronErrors'); + } + }); } } }); |