From 77b047cc62573015fb7cfcf8a6fd003c5fab4786 Mon Sep 17 00:00:00 2001 From: fenn-cs Date: Mon, 16 Oct 2023 15:24:48 +0100 Subject: 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 --- apps/files_sharing/src/views/SharingDetailsTab.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'apps/files_sharing/src') 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 -- cgit v1.2.3