aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2024-02-13 11:05:11 +0100
committerGitHub <noreply@github.com>2024-02-13 11:05:11 +0100
commit922de6e901367f0952abbd98cdebc9df994a9044 (patch)
tree99d3875e3a1c8b0a8bdad94db4dd86122a33ccdd /apps
parentfd04f058c8899612adb174839ebe423f3e47539f (diff)
parent9c8b1231f1b04f223577168085f7a8d8ef3e4706 (diff)
downloadnextcloud-server-922de6e901367f0952abbd98cdebc9df994a9044.tar.gz
nextcloud-server-922de6e901367f0952abbd98cdebc9df994a9044.zip
Merge pull request #43519 from nextcloud/bugfix/41244/improve-video-verification-option
fix(sharing): Move video verification option to password and hide without Talk
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/src/views/SharingDetailsTab.vue14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue
index 8a77100bac1..4681e59391d 100644
--- a/apps/files_sharing/src/views/SharingDetailsTab.vue
+++ b/apps/files_sharing/src/views/SharingDetailsTab.vue
@@ -120,6 +120,11 @@
{{ t('files_sharing', 'Password expired') }}
</span>
</template>
+ <NcCheckboxRadioSwitch v-if="canTogglePasswordProtectedByTalkAvailable"
+ :checked.sync="isPasswordProtectedByTalk"
+ @update:checked="onPasswordProtectedByTalkChange">
+ {{ t('files_sharing', 'Video verification') }}
+ </NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch :checked.sync="hasExpirationDate" :disabled="isExpiryDateEnforced">
{{ isExpiryDateEnforced
? t('files_sharing', 'Expiration date (enforced)')
@@ -140,11 +145,6 @@
@update:checked="queueUpdate('hideDownload')">
{{ t('files_sharing', 'Hide download') }}
</NcCheckboxRadioSwitch>
- <NcCheckboxRadioSwitch v-if="canTogglePasswordProtectedByTalkAvailable"
- :checked.sync="isPasswordProtectedByTalk"
- @update:checked="onPasswordProtectedByTalkChange">
- {{ t('files_sharing', 'Video verification') }}
- </NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch v-if="!isPublicShare" :disabled="!canSetDownload" :checked.sync="canDownload">
{{ t('files_sharing', 'Allow download') }}
</NcCheckboxRadioSwitch>
@@ -618,8 +618,8 @@ export default {
return false
}
- // Anything else should be fine
- return true
+ // Is Talk enabled?
+ return OC.appswebroots.spreed !== undefined
},
canChangeHideDownload() {
const hasDisabledDownload = (shareAttribute) => shareAttribute.key === 'download' && shareAttribute.scope === 'permissions' && shareAttribute.enabled === false