diff --git a/src/api/pbx-seats.js b/src/api/pbx-seats.js
index f21373de..48ff2afd 100644
--- a/src/api/pbx-seats.js
+++ b/src/api/pbx-seats.js
@@ -309,7 +309,15 @@ export function setSeatNumbers (options) {
assignedNumbers: options.assignedNumbers,
unassignedNumbers: options.unassignedNumbers
}).then((result) => {
- resolve(result)
+ if (result.subscriber !== null && result.preferences !== null) {
+ return result
+ }
+ return getSubscriberAndPreferences(options.seatId)
+ }).then((result) => {
+ resolve({
+ seat: result.subscriber,
+ preferences: result.preferences
+ })
}).catch((err) => {
reject(err)
})
diff --git a/src/components/CscPageSticky.vue b/src/components/CscPageSticky.vue
index d065bf13..8adc472a 100644
--- a/src/components/CscPageSticky.vue
+++ b/src/components/CscPageSticky.vue
@@ -15,6 +15,11 @@
name="header"
/>
+
-
-
-
+
+
+
-
-
-
-
- {{ seat | seatName }}
-
-
- {{ $t('Login') }}: {{ seat.webusername }}
-
-
- {{ $t('Extension') }}: {{ seat.pbx_extension }}
-
-
+
+ {{ $t('Login') }}: {{ seat.webusername }}
+
+
+ {{ $t('Extension') }}: {{ seat.pbx_extension }}
+
+
+
+ {{ $t('Groups') }}:
- {{ $t('Groups') }}:
-
-
- {{ groups[groupId] | groupName }}
-
-
-
- {{ $t('No groups') }}
+ {{ groups[groupId] | groupName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/pages/CscPagePbxSeats.vue b/src/pages/CscPagePbxSeats.vue
index 3e6f2cc1..b1c59e30 100644
--- a/src/pages/CscPagePbxSeats.vue
+++ b/src/pages/CscPagePbxSeats.vue
@@ -79,25 +79,10 @@
:intra-pbx="getIntraPbx(seat.id)"
:music-on-hold="getMusicOnHold(seat.id)"
:groups="groupMapById"
- :expanded="isSeatExpanded(seat.id)"
:loading="isSeatLoading(seat.id)"
- :alias-number-options="getNumberOptions"
- :group-options="getGroupOptions"
- :sound-set-options="getSoundSetOptions"
- :sound-set="getSoundSetBySeatId(seat.id)"
- :label-width="4"
- :has-call-queue="hasCallQueue(seat.id)"
- @expand="expandSeat(seat.id)"
- @collapse="collapseSeat(seat.id)"
@remove="openSeatRemovalDialog(seat.id)"
- @save-name="setSeatName"
- @save-extension="setSeatExtension"
- @save-alias-numbers="setSeatNumbers"
- @save-groups="setSeatGroups"
- @save-sound-set="setSeatSoundSet"
@save-intra-pbx="setIntraPbx"
@save-music-on-hold="setMusicOnHold"
- @jump-to-call-queue="jumpToCallQueue"
/>
{
- return state.seatSelected !== null && state.seatSelected.id === id
- }
- },
isSeatRemoving (state) {
return state.seatRemovalState === RequestState.requesting
},
@@ -240,10 +235,10 @@ export default {
state.seatRemovalState = RequestState.failed
state.seatRemovalError = err
},
- expandSeat (state, seatId) {
+ selectSeat (state, seatId) {
state.seatSelected = state.seatMapById[seatId]
},
- collapseSeat (state) {
+ resetSelectedSeat (state) {
state.seatSelected = null
},
enableSeatAddForm (state) {
@@ -399,13 +394,7 @@ export default {
assignedNumbers: options.assignedNumbers,
unassignedNumbers: options.unassignedNumbers
}).then((result) => {
- if (options.assignedNumbers.length > 0) {
- return context.dispatch('loadSeatListItems', {
- clearList: false
- })
- } else {
- return Promise.resolve(result)
- }
+ return Promise.resolve(result)
}).then((result) => {
context.commit('seatUpdateSucceeded', result)
}).catch((err) => {