From b49621f0cadc07bb54e853610cfb4607b1c46acf Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 29 Oct 2019 21:03:10 +0100 Subject: [PATCH] Moar buttons (backup delete) --- src/js/yunohost/controllers/backup.js | 33 +++++++++++++++------------ src/views/backup/backup_info.ms | 4 ++-- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/js/yunohost/controllers/backup.js b/src/js/yunohost/controllers/backup.js index 7c0001dc..1eaf5777 100644 --- a/src/js/yunohost/controllers/backup.js +++ b/src/js/yunohost/controllers/backup.js @@ -86,7 +86,25 @@ data.system_parts = groupHooks(Object.keys(data['system']),data['system']); data.items = (data['system']!={} || data['apps']!=[]); data.locale = y18n.locale; - c.view('backup/backup_info', data, c.selectAllOrNone); + c.view('backup/backup_info', data, function() { + + c.selectAllOrNone(); + + // Delete button + $('button[data-action="delete"]').on('click', function() { + var storage = $(this).data('storage'); + var archive = $(this).data('archive'); + c.confirm( + y18n.t('backup'), + y18n.t('confirm_delete', [archive]), + function(){ + c.api('DELETE', '/backup/archives/'+archive, {}, function(data) { + c.redirect_to('#/backup/'+ storage); + }); + } + ); + }); + }); }); }); @@ -105,19 +123,6 @@ ); }); - // Delete a backup - app.get('#/backup/:storage/:archive/delete', function (c) { - c.confirm( - y18n.t('backup'), - y18n.t('confirm_delete', [c.params['archive']]), - function(){ - c.api('DELETE', '/backup/archives/'+c.params['archive'], {}, function(data) { - c.redirect_to('#/backup/'+ c.params['storage']); - }); - } - ); - }); - function groupHooks(hooks, raw_infos) { var data = {}; var rules = [ diff --git a/src/views/backup/backup_info.ms b/src/views/backup/backup_info.ms index 6cf5fb44..117558a7 100644 --- a/src/views/backup/backup_info.ms +++ b/src/views/backup/backup_info.ms @@ -85,9 +85,9 @@

{{t 'backup_archive_delete'}}

- +