TT#31652 General: Fix communication button

Change-Id: I8c491c394ef976df77ee93082ba6e2ee303a0923
changes/05/18705/1
Hans-Peter Herzog 8 years ago
parent e2b927eee6
commit 508e8701e3

@ -86,10 +86,10 @@
<router-view /> <router-view />
<q-fixed-position id="global-action-btn" corner="top-right" :offset="fabOffset" class="page-button transition-generic"> <q-fixed-position id="global-action-btn" corner="top-right" :offset="fabOffset" class="page-button transition-generic">
<q-fab v-if="hasCommunicationCapabilities" color="primary" icon="question answer" active-icon="clear" direction="down" flat> <q-fab v-if="hasCommunicationCapabilities" color="primary" icon="question answer" active-icon="clear" direction="down" flat>
<q-fab-action v-if="hasFaxCapability" color="primary" @click="" icon="fa-fax"> <q-fab-action v-if="hasFaxCapability && hasSendFaxFeature" color="primary" @click="" icon="fa-fax">
<q-tooltip anchor="center right" self="center left" :offset="[15, 0]">{{ $t('sendFax') }}</q-tooltip> <q-tooltip anchor="center right" self="center left" :offset="[15, 0]">{{ $t('sendFax') }}</q-tooltip>
</q-fab-action> </q-fab-action>
<q-fab-action v-if="hasSmsCapability" color="primary" @click="" icon="fa-send"> <q-fab-action v-if="hasSmsCapability && hasSendSmsFeature" color="primary" @click="" icon="fa-send">
<q-tooltip anchor="center right" self="center left" :offset="[15, 0]">{{ $t('sendSms') }}</q-tooltip> <q-tooltip anchor="center right" self="center left" :offset="[15, 0]">{{ $t('sendSms') }}</q-tooltip>
</q-fab-action> </q-fab-action>
<q-fab-action v-if="isCallAvailable" color="primary" @click="call()" icon="fa-phone"> <q-fab-action v-if="isCallAvailable" color="primary" @click="call()" icon="fa-phone">
@ -188,7 +188,9 @@
'getUsername', 'getUsername',
'isPbxAdmin', 'isPbxAdmin',
'hasSmsCapability', 'hasSmsCapability',
'hasFaxCapability' 'hasFaxCapability',
'hasSendSmsFeature',
'hasSendFaxFeature'
]), ]),
...mapState({ ...mapState({
isCallForward: state => _.startsWith(state.route.path, '/user/call-forward'), isCallForward: state => _.startsWith(state.route.path, '/user/call-forward'),
@ -196,7 +198,9 @@
isPbxConfiguration: state => _.startsWith(state.route.path, '/user/pbx-configuration') isPbxConfiguration: state => _.startsWith(state.route.path, '/user/pbx-configuration')
}), }),
hasCommunicationCapabilities() { hasCommunicationCapabilities() {
return this.isCallAvailable || this.hasSmsCapability || this.hasFaxCapability; return this.isCallAvailable ||
(this.hasSmsCapability && this.hasSendSmsFeature) ||
(this.hasFaxCapability && this.hasSendFaxFeature);
}, },
callClasses() { callClasses() {
let classes = {}; let classes = {};

@ -39,13 +39,17 @@ export default {
}, },
hasSmsCapability(state, getters) { hasSmsCapability(state, getters) {
return state.capabilities !== null && return state.capabilities !== null &&
state.capabilities.sms === true && state.capabilities.sms === true;
state.features.sendSms === true; },
hasSendSmsFeature(state) {
return state.features.sendSms;
},
hasSendFaxFeature(state) {
return state.features.sendFax;
}, },
hasFaxCapability(state, getters) { hasFaxCapability(state, getters) {
return state.capabilities !== null && return state.capabilities !== null &&
state.capabilities.faxserver === true && state.capabilities.faxserver === true;
state.features.sendFax === true;
}, },
hasRtcEngineCapability(state, getters) { hasRtcEngineCapability(state, getters) {
return state.capabilities !== null && _.has(state.capabilities, 'rtcengine'); return state.capabilities !== null && _.has(state.capabilities, 'rtcengine');

Loading…
Cancel
Save