summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorUdo Walter2019-05-01 04:06:17 +0200
committerUdo Walter2019-05-01 04:06:17 +0200
commit762b53329db68fabda7a0be0e5bc38c98d8768e5 (patch)
tree4852b455cc5f3acf4626511c1a3f33adadff7ded /webapp
parent[webapp/groups] compact group view is now optional (diff)
downloadbas-762b53329db68fabda7a0be0e5bc38c98d8768e5.tar.gz
bas-762b53329db68fabda7a0be0e5bc38c98d8768e5.tar.xz
bas-762b53329db68fabda7a0be0e5bc38c98d8768e5.zip
[webapp/groups] small ux fix
Diffstat (limited to 'webapp')
-rw-r--r--webapp/src/components/GroupModuleGroupView.vue4
-rw-r--r--webapp/src/store/groups.js1
2 files changed, 5 insertions, 0 deletions
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)