From 77e67e5d1cc53a9e0855a75d997acccbb6149f3b Mon Sep 17 00:00:00 2001
From: Hans-Peter Herzog <hherzog@sipwise.com>
Date: Thu, 24 Sep 2020 10:02:38 +0200
Subject: [PATCH] TT#94800 Fix Manager Secretary Config input fields

Change-Id: If23488da8d1ca0a7a5addf9f2df63bd915b07bb2
---
 .../pages/PbxConfiguration/CscPbxMsConfig.vue | 52 ++++++++-----------
 .../pages/PbxConfiguration/CscPbxSeat.vue     | 22 ++++----
 2 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/src/components/pages/PbxConfiguration/CscPbxMsConfig.vue b/src/components/pages/PbxConfiguration/CscPbxMsConfig.vue
index 37cc67ee..11b9ea4e 100644
--- a/src/components/pages/PbxConfiguration/CscPbxMsConfig.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxMsConfig.vue
@@ -62,56 +62,46 @@
 		<template
 			slot="body"
 		>
-			<q-field
-				:label="$t('pbxConfig.msConfigNumbersLabel')"
+			<q-select
+				v-model="changes.secretaryNumbers"
+				emit-value
+				map-options
+				multiple
+				chips
+				:disable="loading || numberOptionsLoading"
+				:readonly="loading"
+				:float-label="$t('pbxConfig.msConfigNumberSelectionLabel')"
+				:options="numberOptions"
 			>
-				<q-select
-					v-model="changes.secretaryNumbers"
-					emit-value
-					map-options
-					multiple
-					chips
-					:disable="loading || numberOptionsLoading"
-					:readonly="loading"
-					:float-label="$t('pbxConfig.msConfigNumberSelectionLabel')"
-					:options="numberOptions"
-				/>
-				<csc-fade>
-					<csc-form-save-button
-						v-if="hasSecretaryNumbersChanged"
-						@click="saveSecretaryNumbers"
+				<template
+					v-if="hasSecretaryNumbersChanged"
+					v-slot:append
+				>
+					<csc-input-button-save
+						@click.stop="saveSecretaryNumbers"
 					/>
-				</csc-fade>
-				<csc-fade>
-					<csc-form-reset-button
-						v-if="hasSecretaryNumbersChanged"
-						@click="resetSecretaryNumbers"
+					<csc-input-button-reset
+						@click.stop="resetSecretaryNumbers"
 					/>
-				</csc-fade>
-			</q-field>
+				</template>
+			</q-select>
 		</template>
 	</csc-list-item>
 </template>
 
 <script>
 import _ from 'lodash'
-import CscFade from '../../transitions/CscFade'
 import CscListItem from '../../CscListItem'
 import CscListItemTitle from '../../CscListItemTitle'
 import CscListItemSubtitle from '../../CscListItemSubtitle'
 import CscListMenuItem from '../../CscListMenuItem'
-import CscFormSaveButton from '../../form/CscFormSaveButton'
-import CscFormResetButton from '../../form/CscFormResetButton'
 export default {
 	name: 'CscPbxCallQueue',
 	components: {
-		CscFormResetButton,
-		CscFormSaveButton,
 		CscListItem,
 		CscListItemTitle,
 		CscListItemSubtitle,
-		CscListMenuItem,
-		CscFade
+		CscListMenuItem
 	},
 	props: {
 		odd: {
diff --git a/src/components/pages/PbxConfiguration/CscPbxSeat.vue b/src/components/pages/PbxConfiguration/CscPbxSeat.vue
index c8da3f47..063c67ae 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSeat.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSeat.vue
@@ -95,11 +95,11 @@
 				>
 					<csc-input-button-save
 						v-if="hasNameChanged"
-						@click="save"
+						@click.stop="save"
 					/>
 					<csc-input-button-reset
 						v-if="hasNameChanged"
-						@click="resetName"
+						@click.stop="resetName"
 					/>
 				</template>
 			</q-input>
@@ -114,11 +114,11 @@
 				>
 					<csc-input-button-save
 						v-if="hasExtensionChanged"
-						@click="save"
+						@click.stop="save"
 					/>
 					<csc-input-button-reset
 						v-if="hasExtensionChanged"
-						@click="resetExtension"
+						@click.stop="resetExtension"
 					/>
 				</template>
 			</q-input>
@@ -134,7 +134,6 @@
 				multiple
 				emit-value
 				map-options
-				behavior="dialog"
 				:options="aliasNumberOptions"
 				:label="$t('pbxConfig.aliasNumbers')"
 				:disable="loading"
@@ -144,11 +143,11 @@
 				>
 					<csc-input-button-save
 						v-if="hasAliasNumbersChanged"
-						@click="save"
+						@click.stop="save"
 					/>
 					<csc-input-button-reset
 						v-if="hasAliasNumbersChanged"
-						@click="resetAliasNumbers"
+						@click.stop="resetAliasNumbers"
 					/>
 				</template>
 			</q-select>
@@ -158,7 +157,6 @@
 				multiple
 				emit-value
 				map-options
-				behavior="dialog"
 				:options="groupOptions"
 				:label="$t('pbxConfig.groups')"
 				:disable="loading"
@@ -168,11 +166,11 @@
 				>
 					<csc-input-button-save
 						v-if="hasGroupsChanged"
-						@click="save"
+						@click.stop="save"
 					/>
 					<csc-input-button-reset
 						v-if="hasGroupsChanged"
-						@click="resetGroups"
+						@click.stop="resetGroups"
 					/>
 				</template>
 			</q-select>
@@ -190,11 +188,11 @@
 				>
 					<csc-input-button-save
 						v-if="hasSoundSetChanged"
-						@click="save"
+						@click.stop="save"
 					/>
 					<csc-input-button-reset
 						v-if="hasSoundSetChanged"
-						@click="resetSoundSet"
+						@click.stop="resetSoundSet"
 					/>
 				</template>
 			</q-select>