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/store/groups.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'webapp/src/store/groups.js') diff --git a/webapp/src/store/groups.js b/webapp/src/store/groups.js index 5fe15d3..2785468 100644 --- a/webapp/src/store/groups.js +++ b/webapp/src/store/groups.js @@ -27,7 +27,10 @@ export default { setClientList: (state, list) => { state.clientList = list }, setConfigList: (state, list) => { state.configList = list }, setActiveTab (state, index) { state.activeTab = index }, - setShowAll (state, { index, value }) { state.tabChain[index].tabShowAll = value }, + setShowAll (state, { index, value }) { + state.tabChain[index].tabShowAll = value + state.tabChain[index].autoGoto = false + }, deleteFromTabChain (state, { index, count }) { state.tabChain.splice(index, count) }, adjustTabSlider (state) { state.adjustTabSlider = true }, setTab (state, { index, item }) { @@ -76,7 +79,7 @@ export default { context.dispatch('loadClientList') context.dispatch('loadConfigList') }, - async loadGroup (context, { id, name, tabIndex, switchTab, asParent, gotoInfo }) { + async loadGroup (context, { id, name, tabIndex, switchTab, asParent, gotoInfo, autoGoto }) { const tabChain = context.state.tabChain const showAll = tabChain.length > tabIndex && tabChain[tabIndex].id === id && tabChain[tabIndex].tabShowAll const insert = asParent && tabChain.length > tabIndex && tabIndex >= 1 && tabChain[tabIndex - 1].id !== id @@ -98,6 +101,7 @@ export default { res.data.tabShowAll = showAll res.data.subgroups = Object.freeze(res.data.subgroups) res.data.gotoInfo = asParent || gotoInfo + res.data.autoGoto = autoGoto context.commit('setTab', { index: tabIndex, item: res.data }) } catch (e) { if (switchTab) context.commit('setActiveTab', srcTabIndex) -- cgit v1.2.3-55-g7522