From 762b53329db68fabda7a0be0e5bc38c98d8768e5 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Wed, 1 May 2019 02:06:17 +0000 Subject: [webapp/groups] small ux fix --- webapp/src/components/GroupModuleGroupView.vue | 4 ++++ webapp/src/store/groups.js | 1 + 2 files changed, 5 insertions(+) (limited to 'webapp') diff --git a/webapp/src/components/GroupModuleGroupView.vue b/webapp/src/components/GroupModuleGroupView.vue index fe1017e..6c4905c 100644 --- a/webapp/src/components/GroupModuleGroupView.vue +++ b/webapp/src/components/GroupModuleGroupView.vue @@ -158,6 +158,10 @@ export default { watch: { group (newValue, oldValue) { if (!oldValue.isPlaceholder) return + if (newValue.loadedAsParent) { + this.activeTab = 0 + return + } if (newValue.subgroups.length) this.activeTab = (this.group.id === 0 ? 0 : 1) else if (newValue.clients.length) this.activeTab = (this.group.id === 0 ? 1 : 2) diff --git a/webapp/src/store/groups.js b/webapp/src/store/groups.js index 0f5e756..f52cdcf 100644 --- a/webapp/src/store/groups.js +++ b/webapp/src/store/groups.js @@ -97,6 +97,7 @@ export default { res.data.tabType = 'group' res.data.tabShowAll = showAll res.data.subgroups = Object.freeze(res.data.subgroups) + res.data.loadedAsParent = asParent context.commit('setTab', { index: tabIndex, item: res.data }) } catch (e) { if (switchTab) context.commit('setActiveTab', srcTabIndex) -- cgit v1.2.3-55-g7522