Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/AdminSettings/AllowedGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export default {
saveStartCalls() {
this.loadingStartCalls = true

OCP.AppConfig.setValue('spreed', 'start_calls', this.startCalls.value, {
OCP.AppConfig.setValue('spreed', 'start_calls', String(this.startCalls.value), {
success: () => {
this.loadingStartCalls = false
},
Expand Down
7 changes: 5 additions & 2 deletions src/components/Dashboard/TalkDashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const canModerateSipDialOut = hasTalkFeature('local', 'sip-support-dialout')
&& getTalkConfig('local', 'call', 'sip-enabled')
&& getTalkConfig('local', 'call', 'sip-dialout-enabled')
&& getTalkConfig('local', 'call', 'can-enable-sip')
const isCallEnabled = getTalkConfig('local', 'call', 'enabled')
const canStartConversations = getTalkConfig('local', 'conversations', 'can-create')
const isCalendarEnabled = localCapabilities.calendar?.webui ?? false
const isDirectionRTL = isRTL()
Expand Down Expand Up @@ -196,7 +197,9 @@ function scrollEventCards({ direction }: { direction: 'backward' | 'forward' })
v-if="canStartConversations"
popupRole="dialog">
<template #trigger>
<NcButton variant="primary">
<NcButton
v-if="isCallEnabled"
variant="primary">
<template #icon>
<IconVideoOutline />
</template>
Expand Down Expand Up @@ -237,7 +240,7 @@ function scrollEventCards({ direction }: { direction: 'backward' | 'forward' })
</NcButton>

<NcButton
v-if="canModerateSipDialOut"
v-if="isCallEnabled && canModerateSipDialOut"
@click="EventBus.emit('call-phone-dialog:show')">
<template #icon>
<IconPhoneOutline :size="20" />
Expand Down
4 changes: 1 addition & 3 deletions src/components/TopBar/CallButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
<script>
import { showError } from '@nextcloud/dialogs'
import { emit } from '@nextcloud/event-bus'
import { loadState } from '@nextcloud/initial-state'
import { t } from '@nextcloud/l10n'
import { useIsMobile } from '@nextcloud/vue/composables/useIsMobile'
import NcActionButton from '@nextcloud/vue/components/NcActionButton'
Expand Down Expand Up @@ -222,7 +221,6 @@ export default {
data() {
return {
loading: false,
callEnabled: false,
}
},

Expand Down Expand Up @@ -329,7 +327,7 @@ export default {
},

showStartCallButton() {
return this.callEnabled
return getTalkConfig(this.token, 'call', 'enabled')
&& this.conversation.type !== CONVERSATION.TYPE.NOTE_TO_SELF
&& this.conversation.readOnly === CONVERSATION.STATE.READ_WRITE
&& (!this.conversation.remoteServer || hasTalkFeature(this.token, 'federation-v2'))
Expand Down