Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sharing): Move video verification option to password and hide without Talk #43519

Merged
merged 2 commits into from
Feb 13, 2024
Merged

fix(sharing): Move video verification option to password and hide without Talk #43519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa4b327
fix(sharing): Move video verification option to password and hide wit…
nickvergessen Feb 12, 2024
9c8b123
chore(assets): Recompile JS
nickvergessen Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)')
Expand All @@ -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>
Expand Down Expand Up @@ -618,8 +618,8 @@ export default {
return false
}

// Anything else should be fine
return true
// Is Talk enabled?
return OC.appswebroots.spreed !== undefined
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same logic as 26:

server/apps/files_sharing/src/components/SharingEntryLink.vue

Lines 453 to 462 in ef4a861

},
/**
* Is Talk enabled?
*
* @return {boolean}
*/
isTalkEnabled() {
return OC.appswebroots.spreed !== undefined
},

},
canChangeHideDownload() {
const hasDisabledDownload = (shareAttribute) => shareAttribute.key === 'download' && shareAttribute.scope === 'permissions' && shareAttribute.enabled === false
Expand Down
3 changes: 3 additions & 0 deletions dist/4673-4673.js
View file
Open in desktop

Large diffs are not rendered by default.

0 dist/744-744.js.LICENSE.txt → dist/4673-4673.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions dist/4673-4673.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions dist/744-744.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dist/744-744.js.map
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading