mirror of
https://github.com/nextcloud/server.git
synced 2026-05-28 04:32:30 -04:00
Merge pull request #43519 from nextcloud/bugfix/41244/improve-video-verification-option
fix(sharing): Move video verification option to password and hide without Talk
This commit is contained in:
commit
922de6e901
8 changed files with 14 additions and 14 deletions
|
|
@ -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
|
||||
|
|
|
|||
3
dist/4673-4673.js
vendored
Normal file
3
dist/4673-4673.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/4673-4673.js.map
vendored
Normal file
1
dist/4673-4673.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
3
dist/744-744.js
vendored
3
dist/744-744.js
vendored
File diff suppressed because one or more lines are too long
1
dist/744-744.js.map
vendored
1
dist/744-744.js.map
vendored
File diff suppressed because one or more lines are too long
4
dist/files_sharing-files_sharing_tab.js
vendored
4
dist/files_sharing-files_sharing_tab.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files_sharing-files_sharing_tab.js.map
vendored
2
dist/files_sharing-files_sharing_tab.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue