From ac85bec4d5231c21e5bb1e14bebcfafaec45a31f Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Mon, 6 May 2019 03:09:29 +0000 Subject: [eventmanager] fix date/time picker language --- webapp/src/components/EventModule.vue | 2 -- webapp/src/components/EventModuleDelete.vue | 5 +---- webapp/src/components/EventModuleEdit.vue | 16 +++++++++------- webapp/src/store/events.js | 4 ++-- 4 files changed, 12 insertions(+), 15 deletions(-) (limited to 'webapp') diff --git a/webapp/src/components/EventModule.vue b/webapp/src/components/EventModule.vue index 68f9537..5d2431e 100644 --- a/webapp/src/components/EventModule.vue +++ b/webapp/src/components/EventModule.vue @@ -66,8 +66,6 @@ export default { ...mapGetters(['tabsDark', 'tabsColor', 'tabsSliderColor']), ...mapState('events', ['dialog']) }, - watch: { - }, methods: { ...mapMutations('events', ['setDialog']) }, diff --git a/webapp/src/components/EventModuleDelete.vue b/webapp/src/components/EventModuleDelete.vue index ebf1f83..b06d29c 100644 --- a/webapp/src/components/EventModuleDelete.vue +++ b/webapp/src/components/EventModuleDelete.vue @@ -25,7 +25,7 @@ - {{ $t('cancel') }} + {{ $t('cancel') }} {{ $t('delete') }} @@ -45,9 +45,6 @@ export default { }, methods: { ...mapMutations('events', ['setDialog', 'loadEvents']), - cancelDelete () { - this.setDialog({ show: false }) - }, async deleteEvents () { var deleteIds = [] for (let i = 0; i < this.dialog.info.length; i++) { diff --git a/webapp/src/components/EventModuleEdit.vue b/webapp/src/components/EventModuleEdit.vue index 40b2b87..225614a 100644 --- a/webapp/src/components/EventModuleEdit.vue +++ b/webapp/src/components/EventModuleEdit.vue @@ -214,7 +214,7 @@ v-on="on" > - + @@ -236,7 +236,7 @@ v-on="on" > - + @@ -266,6 +266,7 @@ color="primary" header-color="primary" @click:minute="startTimeMenu = false" + :locale="locale" > @@ -297,6 +298,7 @@ color="primary" header-color="primary" @click:minute="endTimeMenu = false" + :locale="locale" > @@ -383,11 +385,9 @@ {{ $t('cancel') }} - {{ dialog.info.id ? $t('save') : $t('create') }} + {{ dialog.info.id ? $t('save') : $t('create') }} {{ $t('continue') }} - {{ dialog.info.id ? $t('save') : $t('create') }} {{ $t('continue') }} - {{ dialog.info.id ? $t('save') : $t('create') }} @@ -449,7 +449,8 @@ export default { }, computed: { ...mapState('events', ['dialog', 'configList']), - ...mapState('groups', ['groupList', 'clientList']) + ...mapState('groups', ['groupList', 'clientList']), + locale () { return this.$store.state.settings.locale } }, watch: { step (val) { @@ -590,7 +591,8 @@ export default { } await this.loadChilds() // Submit - await this.$http.post('/api/events/' + this.dialog.info.id, { + const url = this.dialog.info.id === undefined ? '/api/events' : '/api/events/' + this.dialog.info.id + await this.$http.post(url, { name: this.name, description: this.description, groups: this.groups.map(x => x.id), diff --git a/webapp/src/store/events.js b/webapp/src/store/events.js index 207a307..60abfef 100644 --- a/webapp/src/store/events.js +++ b/webapp/src/store/events.js @@ -28,8 +28,8 @@ export default { }) }, loadConfigs (context) { - axios.get('/api/ipxeconfigs').then(result => { - context.commit('setConfigList', result.data) + axios.get('/api/ipxeconfigs').then(response => { + context.commit('setConfigList', response.data) }) }, loadLists (context) { -- cgit v1.2.3-55-g7522