From f5d189526cf7083bc637e5b63ccc77d0da091ac2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 10 May 2019 21:15:05 +0200 Subject: [PATCH] Dirty hack to be able to compute size for backup system parts in groupHooks... --- src/js/yunohost/controllers/backup.js | 4 ++-- src/js/yunohost/helpers.js | 9 ++++++--- src/views/backup/backup_info.ms | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/js/yunohost/controllers/backup.js b/src/js/yunohost/controllers/backup.js index 83cdc83c..a4f77b27 100644 --- a/src/js/yunohost/controllers/backup.js +++ b/src/js/yunohost/controllers/backup.js @@ -134,8 +134,8 @@ }; data.other_storages = []; data.name = c.params['archive']; - data.system_parts = c.groupHooks(Object.keys(data['system'])); - data.items = (data['hooks']!={} || data['apps']!=[]); + data.system_parts = c.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); }); diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js index 39575231..260bde6a 100644 --- a/src/js/yunohost/helpers.js +++ b/src/js/yunohost/helpers.js @@ -363,7 +363,7 @@ }); }, - groupHooks: function(hooks) { + groupHooks: function(hooks, raw_infos){ var data = {}; var rules = [ { @@ -376,6 +376,7 @@ $.each(hooks, function(i, hook) { var group_id=hook; + var hook_size=(raw_infos && raw_infos[hook] && raw_infos[hook].size)?raw_infos[hook].size:0; $.each(rules, function(i, rule) { if (rule.isIn(hook)) { group_id = 'adminjs_group_'+rule.id; @@ -387,14 +388,16 @@ data[group_id] = { name:y18n.t('hook_'+group_id), value:data[group_id].value+','+hook, - description:data[group_id].description+', '+y18n.t('hook_'+hook) + description:data[group_id].description+', '+y18n.t('hook_'+hook), + size:data[group_id].size + hook_size }; } else { data[group_id] = { name:y18n.t('hook_'+group_id), value:hook, - description:(group_id==hook)?y18n.t('hook_'+hook+'_desc'):y18n.t('hook_'+hook) + description:(group_id==hook)?y18n.t('hook_'+hook+'_desc'):y18n.t('hook_'+hook), + size:hook_size }; } }); diff --git a/src/views/backup/backup_info.ms b/src/views/backup/backup_info.ms index 7fb7ce24..ae42c67a 100644 --- a/src/views/backup/backup_info.ms +++ b/src/views/backup/backup_info.ms @@ -40,7 +40,11 @@
+ {{#if size}} +

{{name}} ({{ humanSize size }})

+ {{else}}

{{name}}

+ {{/if}}

{{description}}

{{/each}}