Skip to content

Commit

Permalink
Merge pull request #4236 from nextcloud/backport-3827-remove-double-p…
Browse files Browse the repository at this point in the history
…assword-confirmation

[stable11] Remove the double password confirmation on changing cron
  • Loading branch information
MorrisJobke committed Apr 6, 2017
2 parents 125c0eb + c5d9807 commit aabcb04
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions core/js/public/appconfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 6 additions & 3 deletions settings/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
});
}
}
});
Expand Down

0 comments on commit aabcb04

Please sign in to comment.