From 302457e61b313fa301ede862402baa0fff10755f Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Wed, 1 May 2019 15:42:36 +0000
Subject: [webapp/groups] fix tab switching when setting showall

---
 webapp/src/components/GroupModuleGroupView.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'webapp/src/components/GroupModuleGroupView.vue')

diff --git a/webapp/src/components/GroupModuleGroupView.vue b/webapp/src/components/GroupModuleGroupView.vue
index 9fba66e..159f249 100644
--- a/webapp/src/components/GroupModuleGroupView.vue
+++ b/webapp/src/components/GroupModuleGroupView.vue
@@ -148,8 +148,7 @@ export default {
   },
   data () {
     return {
-      activeTab: 0,
-      showAllClicked: false
+      activeTab: 0
     }
   },
   computed: {
@@ -161,6 +160,7 @@ export default {
         this.activeTab = 0
         return
       }
+      if (!newValue.autoGoto) 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)
@@ -170,7 +170,6 @@ export default {
   methods: {
     ...mapMutations('groups', ['setDialog', 'setActiveTab', 'adjustTabSlider', 'deleteFromTabChain', 'setCollapsedView']),
     setShowAll (value) {
-      this.showAllClicked = true
       this.$store.commit('groups/setShowAll', { index: this.tabIndex, value })
       this.$store.dispatch('groups/loadGroup', { id: this.group.id, tabIndex: this.tabIndex })
     },
-- 
cgit v1.2.3-55-g7522

