summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-03-13 15:52:16 +0100
committerJoas Schilling <coding@schilljs.com>2017-03-13 15:52:16 +0100
commitbeb3f92c4da65a93a6f8df9b3772a221cf3637e5 (patch)
tree6d3b3bd032cdb89582b2f1f2c885945933780b41
parentc1cf872f1d99a614bf9d070d1923b78e3e2e26fb (diff)
downloadnextcloud-server-beb3f92c4da65a93a6f8df9b3772a221cf3637e5.tar.gz
nextcloud-server-beb3f92c4da65a93a6f8df9b3772a221cf3637e5.zip
Remove the double password confirmation on changing cron
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--core/js/public/appconfig.js1
-rw-r--r--settings/js/admin.js9
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');
+ }
+ });
}
}
});