Skip to content

Commit 2c6d11d

Browse files
Merge pull request nextcloud#43545 from nextcloud/backport/43519/stable27
[stable27] fix(sharing): Move video verification option to password and hide without Talk
2 parents 1603a67 + 2c20cb9 commit 2c6d11d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

apps/files_sharing/src/views/SharingDetailsTab.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@
109109
{{ t('files_sharing', 'Password expired') }}
110110
</span>
111111
</template>
112+
<NcCheckboxRadioSwitch v-if="canTogglePasswordProtectedByTalkAvailable"
113+
:checked.sync="isPasswordProtectedByTalk"
114+
@update:checked="onPasswordProtectedByTalkChange">
115+
{{ t('files_sharing', 'Video verification') }}
116+
</NcCheckboxRadioSwitch>
112117
<NcCheckboxRadioSwitch :checked.sync="hasExpirationDate" :disabled="isExpiryDateEnforced">
113118
{{ isExpiryDateEnforced
114119
? t('files_sharing', 'Expiration date (enforced)')
@@ -129,11 +134,6 @@
129134
@update:checked="queueUpdate('hideDownload')">
130135
{{ t('files_sharing', 'Hide download') }}
131136
</NcCheckboxRadioSwitch>
132-
<NcCheckboxRadioSwitch v-if="canTogglePasswordProtectedByTalkAvailable"
133-
:checked.sync="isPasswordProtectedByTalk"
134-
@update:checked="onPasswordProtectedByTalkChange">
135-
{{ t('files_sharing', 'Video verification') }}
136-
</NcCheckboxRadioSwitch>
137137
<NcCheckboxRadioSwitch v-if="!isPublicShare" :disabled="!canSetDownload" :checked.sync="canDownload">
138138
{{ t('files_sharing', 'Allow download') }}
139139
</NcCheckboxRadioSwitch>
@@ -599,8 +599,8 @@ export default {
599599
return false
600600
}
601601
602-
// Anything else should be fine
603-
return true
602+
// Is Talk enabled?
603+
return OC.appswebroots.spreed !== undefined
604604
},
605605
canChangeHideDownload() {
606606
const hasDisabledDownload = (shareAttribute) => shareAttribute.key === 'download' && shareAttribute.scope === 'permissions' && shareAttribute.enabled === false

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)