mirror of
https://github.com/nextcloud/server.git
synced 2026-05-14 09:29:52 -04:00
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 9757e680e2
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
This commit is contained in:
parent
281e9ac559
commit
77b047cc62
3 changed files with 10 additions and 10 deletions
|
|
@ -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
|
||||
|
|
|
|||
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