diff --git a/README.md b/README.md index fed9521d..d6da2e7f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This client is a part of the YunoHost projet, and can not be installed directly. ## Bug tracker -Please report issues on the [YunoHost Bugtracker](https://dev.yunohost.org/projects/yunohost/issues), no registration needed. +Please report issues on the [YunoHost Bugtracker](https://github.com/YunoHost/issues). ## Translate diff --git a/debian/changelog b/debian/changelog index 4d2d7175..1a15a34a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yunohost-admin (3.0.0~beta1.2) testing; urgency=low + + Merging with jessie's branches + + -- Alexandre Aubin Fri, 15 Jun 2018 23:23:00 +0000 + yunohost-admin (3.0.0~beta1.1) testing; urgency=low Merging with jessie's branches @@ -10,6 +16,16 @@ yunohost-admin (3.0.0~beta1) testing; urgency=low -- Alexandre Aubin Thu, 03 May 2018 03:04:45 +0000 +yunohost-admin (2.7.13.2) testing; urgency=low + + * [fix] Display active/inactive in service page instead of running/exited/dead + * [fix] Remove "experimental" warning for the backup + * [fix] Fix a bug in backup restore + + Contributors : Bram and Aleks + + -- Alexandre Aubin Fri, 15 Jun 2018 20:15:00 +0000 + yunohost-admin (2.7.13.1) testing; urgency=low * [i18n] Improve French, Portuguese, Arabic, Occitan translations diff --git a/src/js/yunohost/controllers/backup.js b/src/js/yunohost/controllers/backup.js index 9511b6fc..82b1e613 100644 --- a/src/js/yunohost/controllers/backup.js +++ b/src/js/yunohost/controllers/backup.js @@ -62,7 +62,7 @@ app.post('#/backup/:storage', function (c) { - var params = c.ungroupHooks(c.params['hooks'],c.params['apps']); + var params = c.ungroupHooks(c.params['system_parts'],c.params['apps']); c.api('/backup', function() { store.clear('slide'); c.redirect('#/backup/'+ c.params['storage']); @@ -75,7 +75,7 @@ y18n.t('backup'), y18n.t('confirm_restore', [c.params['archive']]), $.proxy(function(c){ - var params = c.ungroupHooks(c.params['hooks'],c.params['apps']); + var params = c.ungroupHooks(c.params['system_parts'],c.params['apps']); params['force'] = ''; c.api('/backup/restore/'+c.params['archive'], function(data) { store.clear('slide'); @@ -134,7 +134,7 @@ }; data.other_storages = []; data.name = c.params['archive']; - data.hooks = c.groupHooks(Object.keys(data['system'])); + data.system_parts = c.groupHooks(Object.keys(data['system'])); data.items = (data['hooks']!={} || data['apps']!=[]); c.view('backup/backup_info', data); }); diff --git a/src/js/yunohost/controllers/services.js b/src/js/yunohost/controllers/services.js index ffb6fa1d..86e515fc 100644 --- a/src/js/yunohost/controllers/services.js +++ b/src/js/yunohost/controllers/services.js @@ -18,7 +18,7 @@ v.name = k; // Handlebars want booleans v.is_loaded = (v.loaded=='enabled') ? true : false; - v.is_running = (v.status=='running') ? true : false; + v.is_running = (v.active=='active') ? true : false; // Translate status and loaded state v.status = y18n.t(v.status); v.loaded = y18n.t(v.loaded); @@ -48,9 +48,9 @@ data2.service.name = c.params['service']; // Handlebars want booleans data2.service.is_loaded = (data.loaded=='enabled') ? true : false; - data2.service.is_running = (data.status=='running') ? true : false; + data2.service.is_running = (data.active=='active') ? true : false; // Translate status and loaded state - data2.service.status = y18n.t(data.status); + data2.service.active = y18n.t(data.active); data2.service.loaded = y18n.t(data.loaded); store.clear('slide'); c.view('service/service_info', data2); diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js index 4422abf5..d057de21 100644 --- a/src/js/yunohost/helpers.js +++ b/src/js/yunohost/helpers.js @@ -359,32 +359,31 @@ return data; }, - ungroupHooks: function(hooks,apps) { + ungroupHooks: function(system_parts,apps) { var data = {}; data['apps'] = apps || []; - data['hooks'] = hooks || []; + data['system'] = system_parts || []; - if (data['hooks'].constructor !== Array) { - data['hooks'] = [data['hooks']]; + if (data['system'].constructor !== Array) { + data['system'] = [data['system']]; } if (data['apps'].constructor !== Array) { data['apps'] = [data['apps']]; } - if (data['hooks'].length == 0) { - data['ignore_hooks'] = ''; - } - if (data['apps'].length == 0) { - data['ignore_apps'] = ''; - } - // Some hook value contains multiple hooks separated by commas var split_hooks = []; - $.each(data['hooks'], function(i, hook) { + $.each(data['system'], function(i, hook) { split_hooks = split_hooks.concat(hook.split(',')); }); - data['hooks'] = split_hooks; + data['system'] = split_hooks; + if (data['system'].length == 0) { + delete data['system']; + } + if (data['apps'].length == 0) { + delete data['apps']; + } return data; }, diff --git a/src/locales/en.json b/src/locales/en.json index bcafc934..0f610adb 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1,5 +1,6 @@ { "action": "Action", + "active": "Active", "add": "Add", "remove": "Remove", "administration_password": "Administration password", @@ -47,7 +48,6 @@ "backup_content": "Backup content", "backup_create": "Create a backup", "backup_encryption_warning": "Don't forget this password, you'll need it if you want restore the archive", - "backup_experimental_warning": "Be aware that the backup feature is still experimental, and may not be fully reliable.", "backup_new": "New backup", "backup_optional_encryption": "Optional encryption", "backup_optional_password": "Optional password", @@ -170,7 +170,7 @@ "installed_apps": "Installed apps", "installing": "Installing", "interface": "Interface", - "internal_exception": "Yunohost encountered an internal error :/
Really sorry about that.
You should look for help on the forum or the chat to fix the situation, or report the bug on the bugtracker.
The following information might be useful for the person helping you :

Action

%s%s

Traceback

%s
", + "internal_exception": "Yunohost encountered an internal error :/
Really sorry about that.
You should look for help on the forum or the chat to fix the situation, or report the bug on the bugtracker.
The following information might be useful for the person helping you :

Action

%s%s

Traceback

%s
", "io": "I/O", "ipv4": "IPv4", "ipv6": "IPv6", diff --git a/src/package.json b/src/package.json index e233a204..45549322 100644 --- a/src/package.json +++ b/src/package.json @@ -15,7 +15,7 @@ "author": "Yunohost", "license": "AGPL-3.0", "bugs": { - "url": "https://dev.yunohost.org/projects/yunohost" + "url": "https://github.com/YunoHost/issues" }, "homepage": "https://github.com/YunoHost/yunohost-admin", "devDependencies": { diff --git a/src/views/backup/backup.ms b/src/views/backup/backup.ms index e49bdffa..c4935d37 100644 --- a/src/views/backup/backup.ms +++ b/src/views/backup/backup.ms @@ -11,10 +11,6 @@
-
{{t 'backup_experimental_warning'}}
- -
-
{{#each storages}} diff --git a/src/views/backup/backup_create.ms b/src/views/backup/backup_create.ms index 1d7d1a17..9081d0ae 100644 --- a/src/views/backup/backup_create.ms +++ b/src/views/backup/backup_create.ms @@ -7,10 +7,6 @@
-
{{t 'backup_experimental_warning'}}
- -
-
@@ -19,7 +15,7 @@
{{#each hooks}}
- +

{{name}}

{{description}}

diff --git a/src/views/backup/backup_info.ms b/src/views/backup/backup_info.ms index 34d8c911..ab64844e 100644 --- a/src/views/backup/backup_info.ms +++ b/src/views/backup/backup_info.ms @@ -7,10 +7,6 @@
-
{{t 'backup_experimental_warning'}}
- -
-

{{t 'infos'}}

@@ -33,9 +29,9 @@
{{#if items}}
- {{#each hooks}} + {{#each system_parts}}
- +

{{name}}

{{description}}

@@ -43,9 +39,9 @@ {{/each}} {{#each apps}}
- - -

{{name}} {{id}}

+ + +

{{name}} {{@key}}

{{/each}}
diff --git a/src/views/backup/backup_list.ms b/src/views/backup/backup_list.ms index 9978a297..e8777938 100644 --- a/src/views/backup/backup_list.ms +++ b/src/views/backup/backup_list.ms @@ -12,10 +12,6 @@
-
{{t 'backup_experimental_warning'}}
- -
-
{{#each archives}} diff --git a/src/views/service/service_info.ms b/src/views/service/service_info.ms index cc584758..869e7a27 100644 --- a/src/views/service/service_info.ms +++ b/src/views/service/service_info.ms @@ -39,7 +39,7 @@
{{t 'service_status'}} - {{status}} + {{active}}
{{t 'started_at'}} diff --git a/src/views/service/service_list.ms b/src/views/service/service_list.ms index 883c9c22..55848ba6 100644 --- a/src/views/service/service_list.ms +++ b/src/views/service/service_list.ms @@ -13,7 +13,7 @@
{{t 'service_status'}} - {{status}} + {{active}}
{{t 'started_at'}}