summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorChristian Hofmaier2019-05-06 05:09:29 +0200
committerChristian Hofmaier2019-05-06 05:09:29 +0200
commitac85bec4d5231c21e5bb1e14bebcfafaec45a31f (patch)
tree3228e0ebe72fed313576496103237bfb344d4c26 /webapp
parent[webapp/datatable] fix unnecessary vertical scrollbars (diff)
downloadbas-ac85bec4d5231c21e5bb1e14bebcfafaec45a31f.tar.gz
bas-ac85bec4d5231c21e5bb1e14bebcfafaec45a31f.tar.xz
bas-ac85bec4d5231c21e5bb1e14bebcfafaec45a31f.zip
[eventmanager] fix date/time picker language
Diffstat (limited to 'webapp')
-rw-r--r--webapp/src/components/EventModule.vue2
-rw-r--r--webapp/src/components/EventModuleDelete.vue5
-rw-r--r--webapp/src/components/EventModuleEdit.vue16
-rw-r--r--webapp/src/store/events.js4
4 files changed, 12 insertions, 15 deletions
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 @@
<v-divider></v-divider>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn flat="flat" @click="cancelDelete">{{ $t('cancel') }}</v-btn>
+ <v-btn flat="flat" @click.native="$store.commit('events/setDialog', { show : false } )">{{ $t('cancel') }}</v-btn>
<v-btn color="error" @click="deleteEvents">{{ $t('delete') }}</v-btn>
</v-card-actions>
</v-card>
@@ -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"
></v-text-field>
</template>
- <v-date-picker color="primary" header-color="primary" v-model="startDate" @input="startDatePick()" first-day-of-week="1"></v-date-picker>
+ <v-date-picker color="primary" header-color="primary" v-model="startDate" @input="startDatePick()" first-day-of-week="1" :locale="locale"></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 md5 offset-md1>
@@ -236,7 +236,7 @@
v-on="on"
></v-text-field>
</template>
- <v-date-picker color="primary" header-color="primary" :min="startDate" v-model="endDate" @input="endDatePick()" first-day-of-week="1"></v-date-picker>
+ <v-date-picker color="primary" header-color="primary" :min="startDate" v-model="endDate" @input="endDatePick()" first-day-of-week="1" :locale="locale"></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 md5>
@@ -266,6 +266,7 @@
color="primary"
header-color="primary"
@click:minute="startTimeMenu = false"
+ :locale="locale"
></v-time-picker>
</v-menu>
</v-flex>
@@ -297,6 +298,7 @@
color="primary"
header-color="primary"
@click:minute="endTimeMenu = false"
+ :locale="locale"
></v-time-picker>
</v-menu>
</v-flex>
@@ -383,11 +385,9 @@
<v-card-actions>
<v-spacer></v-spacer>
<v-btn flat @click.native="$store.commit('events/setDialog', { show : false } )">{{ $t('cancel') }}</v-btn>
- <v-btn :color="dialog.info.id ? 'primary' : 'success'" v-show="step == 1" @click="submit" type="submit">{{ dialog.info.id ? $t('save') : $t('create') }}</v-btn>
+ <v-btn :color="dialog.info.id ? 'primary' : 'success'" @click="submit" type="submit">{{ dialog.info.id ? $t('save') : $t('create') }}</v-btn>
<v-btn color="primary" v-show="step == 1" @click.native="completeStepOne()">{{ $t('continue') }}</v-btn>
- <v-btn :color="dialog.info.id ? 'primary' : 'success'" v-show="step == 2" @click="submit" type="submit">{{ dialog.info.id ? $t('save') : $t('create') }}</v-btn>
<v-btn color="primary" v-show="step == 2 && groups.length > 0" @click.native="completeStepTwo()">{{ $t('continue') }}</v-btn>
- <v-btn :color="dialog.info.id ? 'primary' : 'success'" v-show="step == 3" @click="submit" type="submit">{{ dialog.info.id ? $t('save') : $t('create') }}</v-btn>
</v-card-actions>
</v-card>
</template>
@@ -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) {