Skip to content

Commit 9577dde

Browse files
Merge pull request #43546 from nextcloud/backport/43519/stable28
[stable28] fix(sharing): Move video verification option to password and hide without Talk
2 parents 79f2eb6 + f0215e9 commit 9577dde

8 files changed

Lines changed: 14 additions & 14 deletions

apps/files_sharing/src/views/SharingDetailsTab.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@
120120
{{ t('files_sharing', 'Password expired') }}
121121
</span>
122122
</template>
123+
<NcCheckboxRadioSwitch v-if="canTogglePasswordProtectedByTalkAvailable"
124+
:checked.sync="isPasswordProtectedByTalk"
125+
@update:checked="onPasswordProtectedByTalkChange">
126+
{{ t('files_sharing', 'Video verification') }}
127+
</NcCheckboxRadioSwitch>
123128
<NcCheckboxRadioSwitch :checked.sync="hasExpirationDate" :disabled="isExpiryDateEnforced">
124129
{{ isExpiryDateEnforced
125130
? t('files_sharing', 'Expiration date (enforced)')
@@ -140,11 +145,6 @@
140145
@update:checked="queueUpdate('hideDownload')">
141146
{{ t('files_sharing', 'Hide download') }}
142147
</NcCheckboxRadioSwitch>
143-
<NcCheckboxRadioSwitch v-if="canTogglePasswordProtectedByTalkAvailable"
144-
:checked.sync="isPasswordProtectedByTalk"
145-
@update:checked="onPasswordProtectedByTalkChange">
146-
{{ t('files_sharing', 'Video verification') }}
147-
</NcCheckboxRadioSwitch>
148148
<NcCheckboxRadioSwitch v-if="!isPublicShare" :disabled="!canSetDownload" :checked.sync="canDownload">
149149
{{ t('files_sharing', 'Allow download') }}
150150
</NcCheckboxRadioSwitch>
@@ -618,8 +618,8 @@ export default {
618618
return false
619619
}
620620
621-
// Anything else should be fine
622-
return true
621+
// Is Talk enabled?
622+
return OC.appswebroots.spreed !== undefined
623623
},
624624
canChangeHideDownload() {
625625
const hasDisabledDownload = (shareAttribute) => shareAttribute.key === 'download' && shareAttribute.scope === 'permissions' && shareAttribute.enabled === false

dist/1373-1373.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/1373-1373.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/2325-2325.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

dist/2325-2325.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/files_sharing-files_sharing_tab.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-files_sharing_tab.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)