From 53028fd8498c7b7ea997c1af51162d26d972ba05 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Sat, 13 Apr 2019 13:33:51 +0000 Subject: [groups,clients] include config as association --- webapp/src/assets/styles.css | 6 +++--- webapp/src/components/DataTable.vue | 2 +- webapp/src/components/GroupModuleClientView.vue | 5 +---- webapp/src/components/GroupModuleGroupView.vue | 5 +---- webapp/src/store/groups.js | 10 +--------- 5 files changed, 7 insertions(+), 21 deletions(-) (limited to 'webapp') diff --git a/webapp/src/assets/styles.css b/webapp/src/assets/styles.css index 451d146..83556ca 100644 --- a/webapp/src/assets/styles.css +++ b/webapp/src/assets/styles.css @@ -10,9 +10,9 @@ html { } .selectable { - -webkit-user-select: auto; /* Safari 3.1+ */ - -moz-user-select: auto; /* Firefox 2+ */ - -ms-user-select: auto; /* IE 10+ */ + -webkit-user-select: text; /* Safari 3.1+ */ + -moz-user-select: text; /* Firefox 2+ */ + -ms-user-select: text; /* IE 10+ */ user-select: text; /* Standard syntax */ } diff --git a/webapp/src/components/DataTable.vue b/webapp/src/components/DataTable.vue index eade3fc..61c9d6d 100644 --- a/webapp/src/components/DataTable.vue +++ b/webapp/src/components/DataTable.vue @@ -162,7 +162,7 @@ {{ selectedIconMap[item.selected] }}
- {{ item.data[header.key] }} + {{ item.data[header.key] }}
diff --git a/webapp/src/components/GroupModuleClientView.vue b/webapp/src/components/GroupModuleClientView.vue index e5e3630..c8f0bb1 100644 --- a/webapp/src/components/GroupModuleClientView.vue +++ b/webapp/src/components/GroupModuleClientView.vue @@ -75,7 +75,7 @@ v-model="info.configId" :items="configList" > -
{{ configName || '-' }}
+
{{ client.config ? (client.config.name || client.config.id) : '-' }}
@@ -177,9 +177,6 @@ export default { }, computed: { ...mapState('groups', ['groupList', 'configList']), - configName () { - return this.$store.state.groups.configNames[this.client.configId] - }, headers () { return [ { key: 'name', text: this.$t('name') } diff --git a/webapp/src/components/GroupModuleGroupView.vue b/webapp/src/components/GroupModuleGroupView.vue index ebbcfbc..2f79911 100644 --- a/webapp/src/components/GroupModuleGroupView.vue +++ b/webapp/src/components/GroupModuleGroupView.vue @@ -114,7 +114,7 @@ v-model="info.configId" :items="configList" > -
{{ configName || '-' }}
+
{{ group.config ? (group.config.name || group.config.id) : '-' }}
@@ -228,9 +228,6 @@ export default { }, computed: { ...mapState('groups', ['groupList', 'configList']), - configName () { - return this.$store.state.groups.configNames[this.group.configId] - }, headers () { return [ { key: 'name', text: this.$t('name') } diff --git a/webapp/src/store/groups.js b/webapp/src/store/groups.js index 28dc0fd..8d97bd7 100644 --- a/webapp/src/store/groups.js +++ b/webapp/src/store/groups.js @@ -7,7 +7,6 @@ export default { groupList: [], clientList: [], configList: [], - configNames: {}, tabChain: [], activeTab: 0, dialog: { @@ -18,14 +17,7 @@ export default { mutations: { setGroupList: (state, list) => { state.groupList = list }, setClientList: (state, list) => { state.clientList = list }, - setConfigList: (state, list) => { - state.configList = list - var names = {} - list.forEach(config => { - names[config.id] = config.name - }) - state.configNames = names - }, + setConfigList: (state, list) => { state.configList = list }, setActiveTab (state, index) { state.activeTab = index }, setShowAll (state, { index, value }) { state.tabChain[index].tabShowAll = value }, deleteFromTabChain (state, { index, count }) { state.tabChain.splice(index, count) }, -- cgit v1.2.3-55-g7522