Merge pull request #43546 from nextcloud/backport/43519/stable28

[stable28] fix(sharing): Move video verification option to password and hide without Talk
nextcloud · Feb 13, 2024 · 9577dde · 9577dde
2 parents 79f2eb6 + f0215e9
commit 9577dde
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git 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

diff --git a/dist/1373-1373.js b/dist/1373-1373.js
diff --git a/dist/2325-2325.js.LICENSE.txt → dist/1373-1373.js.LICENSE.txt b/dist/2325-2325.js.LICENSE.txt → dist/1373-1373.js.LICENSE.txt
diff --git a/dist/1373-1373.js.map b/dist/1373-1373.js.map
diff --git a/dist/2325-2325.js b/dist/2325-2325.js
diff --git a/dist/2325-2325.js.map b/dist/2325-2325.js.map
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map