mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26026 from nextcloud/backport/25933/stable21 

[stable21] Hide expiration date field for remote shares
This commit is contained in:
Roeland Jago Douma 2021-03-10 15:46:57 +01:00 committed by GitHub
parent f94c69123a ff95956e5d
commit cc48b81411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

18
apps/files_sharing/src/components/SharingEntry.vue
View File

@ -84,14 +84,16 @@
</ActionCheckbox> </ActionCheckbox>
<!-- expiration date --> <!-- expiration date -->
<ActionCheckbox :checked.sync="hasExpirationDate" <ActionCheckbox
v-if="canHaveExpirationDate"
:checked.sync="hasExpirationDate"
:disabled="config.isDefaultInternalExpireDateEnforced || saving" :disabled="config.isDefaultInternalExpireDateEnforced || saving"
@uncheck="onExpirationDisable"> @uncheck="onExpirationDisable">
{{ config.isDefaultInternalExpireDateEnforced {{ config.isDefaultInternalExpireDateEnforced
? t('files_sharing', 'Expiration date enforced') ? t('files_sharing', 'Expiration date enforced')
: t('files_sharing', 'Set expiration date') }} : t('files_sharing', 'Set expiration date') }}
</ActionCheckbox> </ActionCheckbox>
<ActionInput v-if="hasExpirationDate" <ActionInput v-if="canHaveExpirationDate && hasExpirationDate"
ref="expireDate" ref="expireDate"
v-tooltip.auto="{ v-tooltip.auto="{
content: errors.expireDate, content: errors.expireDate,
@ -222,8 +224,16 @@ export default {
}, },
canHaveNote() { canHaveNote() {
return this.share.type !== this.SHARE_TYPES.SHARE_TYPE_REMOTE return !this.isRemoteShare
&& this.share.type !== this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP },
canHaveExpirationDate() {
return !this.isRemoteShare
},
isRemoteShare() {
return this.share.type === this.SHARE_TYPES.SHARE_TYPE_REMOTE
|| this.share.type === this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP
}, },
/** /**