From 3f2d126dba95ace251cf49f952ffa0ada6729f65 Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Sun, 14 Apr 2019 16:20:31 +0000 Subject: [eventmanager] show config name instead of config id in event table - change models/migrations for config association --- webapp/src/components/EventModuleEdit.vue | 9 +-------- webapp/src/components/EventModuleEventList.vue | 2 +- webapp/src/store/events.js | 3 +++ 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'webapp') diff --git a/webapp/src/components/EventModuleEdit.vue b/webapp/src/components/EventModuleEdit.vue index 196a94e..5421fba 100644 --- a/webapp/src/components/EventModuleEdit.vue +++ b/webapp/src/components/EventModuleEdit.vue @@ -458,14 +458,7 @@ export default { this.description = value.info.description || '' this.important = value.info.important || false - this.config = [] - if (value.info.config) { - for (let i = 0; i < this.configList.length; i++) { - if (this.configList[i].id === value.info.config) { - this.config.push(this.configList[i]) - } - } - } + this.config = [value.info.config] || [] this.times = value.info.times ? JSON.parse(value.info.times) : {} this.repetitiveEvent = this.times.repetitive || false diff --git a/webapp/src/components/EventModuleEventList.vue b/webapp/src/components/EventModuleEventList.vue index fe2ac1a..1cbe233 100644 --- a/webapp/src/components/EventModuleEventList.vue +++ b/webapp/src/components/EventModuleEventList.vue @@ -58,7 +58,7 @@ export default { return [ { text: this.$t('name'), key: 'name' }, { text: this.$t('description'), key: 'description' }, - { text: this.$t('config'), key: 'config' }, + { text: this.$t('config'), key: 'configName' }, { sortable: false, key: 'action', width: '60px' } ] }, diff --git a/webapp/src/store/events.js b/webapp/src/store/events.js index 9f9e29b..7a5551f 100644 --- a/webapp/src/store/events.js +++ b/webapp/src/store/events.js @@ -19,6 +19,9 @@ export default { actions: { loadEvents (context) { axios.get('/api/events').then(response => { + for (let i = 0; i < response.data.length; i++) { + response.data[i].configName = response.data[i].config.name + } context.commit('setEvents', response.data) }) }, -- cgit v1.2.3-55-g7522