diff options
| author | fenn-cs <fenn25.fn@gmail.com> | 2023-10-16 15:24:48 +0100 |
|---|---|---|
| committer | fenn-cs <fenn25.fn@gmail.com> | 2023-10-28 09:53:41 +0100 |
| commit | 77b047cc62573015fb7cfcf8a6fd003c5fab4786 (patch) | |
| tree | 2d387a689b0b31fa09ac622d60b12386a20f5d4a /apps/files_sharing | |
| parent | 281e9ac559802a8dbc7bfc9796a3e860331b57bf (diff) | |
| download | nextcloud-server-77b047cc62573015fb7cfcf8a6fd003c5fab4786.tar.gz nextcloud-server-77b047cc62573015fb7cfcf8a6fd003c5fab4786.zip | |
Check expiry enforcement for all share types
We should check that a maximum expiry date has been enforced for
all shares and NOT JUST FOR internal shares before enforcing a UI max date,
like in commit 9757e680e2f643fe19432255c4142e96fbc88df5
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/src/views/SharingDetailsTab.vue | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue index 657daa2dfb8..fdb38da7f79 100644 --- a/apps/files_sharing/src/views/SharingDetailsTab.vue +++ b/apps/files_sharing/src/views/SharingDetailsTab.vue @@ -418,14 +418,14 @@ export default { return this.fileInfo.type === 'dir' }, maxExpirationDateEnforced() { - if (this.isPublicShare) { - return this.config.defaultExpirationDate - } - if (this.isRemoteShare) { - return this.config.defaultRemoteExpirationDateString - } - // If it get's here then it must be an internal share if (this.isExpiryDateEnforced) { + if (this.isPublicShare) { + return this.config.defaultExpirationDate + } + if (this.isRemoteShare) { + return this.config.defaultRemoteExpirationDateString + } + // If it get's here then it must be an internal share return this.config.defaultInternalExpirationDate } return null |