summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorChristian Hofmaier2019-04-04 01:50:29 +0200
committerChristian Hofmaier2019-04-04 01:50:29 +0200
commit9e8e5bce78b190373467e4de6f8f803c8725063e (patch)
tree7d01e36edb805b624a282c9a716c766381bbc135 /webapp
parent[eventmanager] fix removeColumn (diff)
downloadbas-9e8e5bce78b190373467e4de6f8f803c8725063e.tar.gz
bas-9e8e5bce78b190373467e4de6f8f803c8725063e.tar.xz
bas-9e8e5bce78b190373467e4de6f8f803c8725063e.zip
[eventmanager] fix bug tab-content not loading correctly
- fix blacklist not resetting when new edit dialog - remove unwanted paddings - [configloader] remove console logs
Diffstat (limited to 'webapp')
-rw-r--r--webapp/src/components/EventModuleEdit.vue31
1 files changed, 16 insertions, 15 deletions
diff --git a/webapp/src/components/EventModuleEdit.vue b/webapp/src/components/EventModuleEdit.vue
index 78210e3..4ad68d9 100644
--- a/webapp/src/components/EventModuleEdit.vue
+++ b/webapp/src/components/EventModuleEdit.vue
@@ -105,7 +105,7 @@
<template>
<v-card>
- <v-card-title style="padding: 0px">
+ <v-card-title style="padding: 0px; z-index: 1">
<v-stepper v-model="step" horizontal style="width: 100%; background: transparent;" class="elevation-3">
<v-stepper-header>
<v-stepper-step
@@ -137,7 +137,7 @@
</v-stepper-header>
</v-stepper>
</v-card-title>
- <v-card-text class="table-container">
+ <v-card-text class="pa-0">
<v-form v-model="valid" ref="form" @submit.prevent="submit" lazy-validation>
<v-stepper v-model="step" horizontal style="width: 100%; background: transparent" class="elevation-0">
<v-stepper-items>
@@ -336,34 +336,30 @@
</v-layout>
</v-stepper-content>
- <v-stepper-content step="2">
- <v-tabs v-model="tabs" grow slider-color="primary">
+ <v-stepper-content step="2" class="stepper-padding-0">
+ <v-tabs v-if="step == 2" v-model="tabs" grow slider-color="primary">
<v-tab><v-icon class="tabbar-tabicon">category</v-icon>{{ groups.length + ' ' + $t('groups') }}</v-tab>
<v-tab><v-icon class="tabbar-tabicon">computer</v-icon>{{ clients.length + ' ' + $t('clients') }}</v-tab>
- </v-tabs>
- <v-tabs-items v-model="tabs">
<v-tab-item>
<data-table v-model="groups" :headers="groupHeaders" :items="groupList"/>
</v-tab-item>
<v-tab-item>
<data-table v-model="clients" :headers="clientHeaders" :items="clientList"/>
</v-tab-item>
- </v-tabs-items>
+ </v-tabs>
</v-stepper-content>
- <v-stepper-content step="3">
- <v-tabs v-model="tabs" grow slider-color="primary">
+ <v-stepper-content step="3" class="stepper-padding-0">
+ <v-tabs v-if="step == 3" v-model="tabs" grow slider-color="primary">
<v-tab><v-icon class="tabbar-tabicon">category</v-icon>{{ blacklistGroups.length + ' ' + $t('blacklistGroups') }}</v-tab>
<v-tab><v-icon class="tabbar-tabicon">computer</v-icon>{{ blacklistClients.length + ' ' + $t('blacklistClients') }}</v-tab>
- </v-tabs>
- <v-tabs-items v-model="tabs">
<v-tab-item>
<data-table v-model="blacklistGroups" :headers="groupHeaders" :items="blackgroupList"/>
</v-tab-item>
<v-tab-item>
<data-table v-model="blacklistClients" :headers="clientHeaders" :items="blackclientList"/>
</v-tab-item>
- </v-tabs-items>
+ </v-tabs>
</v-stepper-content>
</v-stepper-items>
@@ -448,6 +444,7 @@ export default {
if (value.type === 'edit' && value.show) {
if (this.$refs.form) this.$refs.form.resetValidation()
this.step = 1
+ this.tabs = 0
this.intervalTypes = [
{ name: this.$t('day'), value: 'day' },
{ name: this.$t('week'), value: 'week' },
@@ -517,6 +514,10 @@ export default {
} else {
this.groups = []
this.clients = value.info.clients ? value.info.clients : []
+ this.blacklistGroups = []
+ this.blacklistClients = []
+ this.blackgroupList = []
+ this.blackclientList = []
}
}
}
@@ -629,11 +630,11 @@ export default {
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped>
-.info-input {
- margin: 20px;
-}
.no-margin {
margin-right: 0px;
margin-left: 0px;
}
+.stepper-padding-0 {
+ padding: 0;
+}
</style>