diff --git a/src/api/call-forwarding.js b/src/api/call-forwarding.js index c1feebbb..9dc960b4 100644 --- a/src/api/call-forwarding.js +++ b/src/api/call-forwarding.js @@ -41,14 +41,16 @@ export async function cfGetMostRecentDestinationSetByName (params) { export async function cfLoadSourceSets (subscriberId) { return getList({ resource: 'cfsourcesets', - params: (subscriberId) ? { subscriber_id: subscriberId } : {} + params: (subscriberId) ? { subscriber_id: subscriberId } : {}, + all: true }) } export async function cfLoadTimeSets (subscriberId) { return getList({ resource: 'cftimesets', - params: (subscriberId) ? { subscriber_id: subscriberId } : {} + params: (subscriberId) ? { subscriber_id: subscriberId } : {}, + all: true }) } diff --git a/src/components/call-forwarding/CscCfConditionPopupCustom.vue b/src/components/call-forwarding/CscCfConditionPopupCustom.vue new file mode 100644 index 00000000..71e4d956 --- /dev/null +++ b/src/components/call-forwarding/CscCfConditionPopupCustom.vue @@ -0,0 +1,33 @@ + + + diff --git a/src/components/call-forwarding/CscCfGroupConditionCustom.vue b/src/components/call-forwarding/CscCfGroupConditionCustom.vue new file mode 100644 index 00000000..eb24731e --- /dev/null +++ b/src/components/call-forwarding/CscCfGroupConditionCustom.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/components/call-forwarding/CscCfGroupConditionDate.vue b/src/components/call-forwarding/CscCfGroupConditionDate.vue index 73796168..c31b78be 100644 --- a/src/components/call-forwarding/CscCfGroupConditionDate.vue +++ b/src/components/call-forwarding/CscCfGroupConditionDate.vue @@ -23,7 +23,7 @@ flat color="negative" icon="delete" - @click="deleteSourceSetEvent" + @click="deleteTimeSetEvent" /> { this.$wait.start(this.waitIdentifier) if (this.destinationSet.destinations.length > 1) { - await this.removeDestination(payload) + await this.triggerRemoveDestination(payload) this.setAnnouncement() } else { this.$emit('delete-last', payload) @@ -273,6 +273,13 @@ export default { this.$wait.end(this.waitIdentifier) }) }, + async triggerRemoveDestination (payload) { + try { + await this.removeDestination(payload) + } catch (e) { + showGlobalError(e.message) + } + }, async updateDestinationTimeoutEvent (payload) { this.$wait.start(this.waitIdentifier) await this.updateDestinationTimeout(payload) diff --git a/src/components/call-forwarding/CscCfGroupTitle.vue b/src/components/call-forwarding/CscCfGroupTitle.vue index 50292d48..a19910d4 100644 --- a/src/components/call-forwarding/CscCfGroupTitle.vue +++ b/src/components/call-forwarding/CscCfGroupTitle.vue @@ -144,7 +144,6 @@ > {{ $t('office hours are') }} - - {{ $filters.timeSetTimes(timeSet.times) }} - +