From 1c5e5a0a2c5d597b1a063d88b94f3c949d3f5f5a Mon Sep 17 00:00:00 2001 From: Kayou Date: Wed, 3 Apr 2019 01:04:56 +0200 Subject: [PATCH 1/3] Add apps infos in backup_info --- src/views/backup/backup_info.ms | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/backup/backup_info.ms b/src/views/backup/backup_info.ms index b212ebde..3b72065f 100644 --- a/src/views/backup/backup_info.ms +++ b/src/views/backup/backup_info.ms @@ -41,14 +41,16 @@

{{name}}

-

{{description}}

+

{{t 'description'}} - {{description}}

{{/each}} {{#each apps}}
-

{{name}} {{@key}}

+

{{name}} {{@key}} ({{ humanSize size }})

+

{{t 'description'}} - {{description}}

+

{{t 'version'}} - {{version}}

{{/each}}
From 97091cba2bc64c2130b250fc4737261de98fb622 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 10 May 2019 19:44:12 +0200 Subject: [PATCH 2/3] More elegant rendering ? --- src/locales/en.json | 13 +++++++------ src/views/backup/backup_info.ms | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 7a164f1f..00fefb1e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -155,20 +155,21 @@ "good_practices_about_admin_password": "You are now about to define a new admin password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).", "good_practices_about_user_password": "You are now about to define a new user password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).", "home": "Home", - "hook_adminjs_group_configuration": "Configuration", - "hook_conf_cron": "Regular tasks", - "hook_conf_ldap": "LDAP", + "hook_adminjs_group_configuration": "System configurations", + "hook_conf_cron": "Automatic tasks", + "hook_conf_ynh_currenthost": "Current main domain", + "hook_conf_ldap": "LDAP database", "hook_conf_nginx": "Nginx", "hook_conf_ssh": "SSH", "hook_conf_ssowat": "SSOwat", "hook_conf_xmpp": "XMPP", - "hook_conf_ynh_certs": "Security certificates", + "hook_conf_ynh_certs": "SSL certificates", "hook_conf_ynh_firewall": "Firewall", - "hook_conf_ynh_mysql": "Password MySQL", + "hook_conf_ynh_mysql": "MySQL password", "hook_data_home": "User data", "hook_data_home_desc": "User data located in /home/USER", "hook_data_mail": "Mail", - "hook_data_mail_desc": "Mails stored on the server", + "hook_data_mail_desc": "Raw emails stored on the server", "hostname": "Hostname", "id": "ID", "inactive": "Inactive", diff --git a/src/views/backup/backup_info.ms b/src/views/backup/backup_info.ms index 3b72065f..7fb7ce24 100644 --- a/src/views/backup/backup_info.ms +++ b/src/views/backup/backup_info.ms @@ -41,7 +41,7 @@

{{name}}

-

{{t 'description'}} - {{description}}

+

{{description}}

{{/each}} {{#each apps}} @@ -49,8 +49,8 @@

{{name}} {{@key}} ({{ humanSize size }})

-

{{t 'description'}} - {{description}}

-

{{t 'version'}} - {{version}}

+

{{description}}

+

{{t 'version'}} {{version}}

{{/each}}
From f5d189526cf7083bc637e5b63ccc77d0da091ac2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 10 May 2019 21:15:05 +0200 Subject: [PATCH 3/3] 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}}