From 94da3526d70c42fa2c09067516ea979da87d8f39 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Tue, 1 Feb 2022 16:21:00 +0000 Subject: [PATCH 1/3] ToolSettings view --- app/src/router/routes.js | 9 ++++ app/src/views/tool/ToolList.vue | 1 + app/src/views/tool/ToolSettings.vue | 64 +++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 app/src/views/tool/ToolSettings.vue diff --git a/app/src/router/routes.js b/app/src/router/routes.js index 2f705404..2e404e34 100644 --- a/app/src/router/routes.js +++ b/app/src/router/routes.js @@ -374,6 +374,15 @@ const routes = [ breadcrumb: ['tool-list', 'tool-webadmin'] } }, + { + name: 'tool-settings', + path: '/tools/settings', + component: () => import(/* webpackChunkName: "views/tools/settings" */ '@/views/tool/ToolSettings'), + meta: { + args: { trad: 'tools_yunohost_settings' }, + breadcrumb: ['tool-list', 'tool-settings'] + } + }, { name: 'tool-power', path: '/tools/power', diff --git a/app/src/views/tool/ToolList.vue b/app/src/views/tool/ToolList.vue index 21716ca0..10dd5373 100644 --- a/app/src/views/tool/ToolList.vue +++ b/app/src/views/tool/ToolList.vue @@ -24,6 +24,7 @@ export default { { routeName: 'tool-migrations', icon: 'share', translation: 'migrations' }, { routeName: 'tool-firewall', icon: 'shield', translation: 'firewall' }, { routeName: 'tool-adminpw', icon: 'key-modern', translation: 'tools_adminpw' }, + { routeName: 'tool-settings', icon: 'cog', translation: 'tools_yunohost_settings' }, { routeName: 'tool-webadmin', icon: 'cog', translation: 'tools_webadmin_settings' }, { routeName: 'tool-power', icon: 'power-off', translation: 'tools_shutdown_reboot' } ] diff --git a/app/src/views/tool/ToolSettings.vue b/app/src/views/tool/ToolSettings.vue new file mode 100644 index 00000000..54d32981 --- /dev/null +++ b/app/src/views/tool/ToolSettings.vue @@ -0,0 +1,64 @@ + + + From 00db70764d9d50d8fd11bd74349491865a05d2dd Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Wed, 9 Feb 2022 22:04:55 +0100 Subject: [PATCH 2/3] Update app/src/router/routes.js Co-authored-by: Axolotle --- app/src/router/routes.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/router/routes.js b/app/src/router/routes.js index 2e404e34..4253307d 100644 --- a/app/src/router/routes.js +++ b/app/src/router/routes.js @@ -375,13 +375,21 @@ const routes = [ } }, { - name: 'tool-settings', path: '/tools/settings', component: () => import(/* webpackChunkName: "views/tools/settings" */ '@/views/tool/ToolSettings'), - meta: { - args: { trad: 'tools_yunohost_settings' }, - breadcrumb: ['tool-list', 'tool-settings'] - } + children: [ + { + name: 'tool-settings', + path: ':tabId?', + component: () => import(/* webpackChunkName: "components/configPanel" */ '@/components/ConfigPanel'), + props: true, + meta: { + routerParams: [], + args: { trad: 'tools_yunohost_settings' }, + breadcrumb: ['tool-list', 'tool-settings'] + } + } + ] }, { name: 'tool-power', From 2671fd32d3c3dc3293fc6c9bb3741f3811606d82 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 6 Aug 2022 13:50:40 +0200 Subject: [PATCH 3/3] global settings: fix i18n --- app/src/i18n/locales/en.json | 4 ++++ app/src/views/tool/ToolSettings.vue | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/i18n/locales/en.json b/app/src/i18n/locales/en.json index 7eac7dec..81d17059 100644 --- a/app/src/i18n/locales/en.json +++ b/app/src/i18n/locales/en.json @@ -452,6 +452,9 @@ "create": "Create user '{name}'", "delete": "Delete user '{name}'", "update": "Update user '{name}'" + }, + "settings": { + "update": "Update global settings" } }, "run": "Run", @@ -501,6 +504,7 @@ "experimental_description": "Gives you access to experimental features. These are considered unstable and may break your system.
Enable this only if you know what you are doing.", "transitions": "Page transition animations" }, + "tools_yunohost_settings": "YunoHost settings", "tools_webadmin_settings": "Web-admin settings", "traceback": "Traceback", "udp": "UDP", diff --git a/app/src/views/tool/ToolSettings.vue b/app/src/views/tool/ToolSettings.vue index 54d32981..8cf6dfa6 100644 --- a/app/src/views/tool/ToolSettings.vue +++ b/app/src/views/tool/ToolSettings.vue @@ -48,7 +48,7 @@ export default { api.put( 'settings', { key: id_, args: objectToParams(formatedData) }, - { key: 'tools.update_settings', name: this.name } + { key: 'settings.update', name: this.name } ).then(() => { this.$refs.view.fetchQueries({ triggerLoading: true }) }).catch(err => {