mirror of
https://github.com/nextcloud/server.git
synced 2026-06-10 09:13:19 -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
4b70f19837
commit
92417cd594
10 changed files with 17 additions and 17 deletions
|
|
@ -430,14 +430,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
|
||||
|
|
|
|||
3
dist/6264-6264.js
vendored
Normal file
3
dist/6264-6264.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/6264-6264.js.map
vendored
Normal file
1
dist/6264-6264.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
3
dist/9923-9923.js
vendored
3
dist/9923-9923.js
vendored
File diff suppressed because one or more lines are too long
1
dist/9923-9923.js.map
vendored
1
dist/9923-9923.js.map
vendored
File diff suppressed because one or more lines are too long
4
dist/dav-settings-personal-availability.js
vendored
4
dist/dav-settings-personal-availability.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
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