mirror of
https://github.com/nextcloud/server.git
synced 2026-04-15 22:11:17 -04:00
Allow share expiry dates lower than enforced limits
Previously, users could change the share expiry date up to the enforced maximum. The new share flow imposed the enforced share expiry date maximum literally and did not allow even dates lower than the maximum enforced. That does not make much sense, if the enforced expiry date is 30 days from creation date, then it's logical to allow users set the date to anything less than 30 days from the creation date. Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
This commit is contained in:
parent
4f222b9fba
commit
281e9ac559
7 changed files with 21 additions and 17 deletions
|
|
@ -113,11 +113,10 @@
|
|||
</NcCheckboxRadioSwitch>
|
||||
<NcDateTimePickerNative v-if="hasExpirationDate"
|
||||
id="share-date-picker"
|
||||
:value="new Date(share.expireDate)"
|
||||
:value="new Date(share.expireDate ?? dateTomorrow)"
|
||||
:min="dateTomorrow"
|
||||
:max="dateMaxEnforced"
|
||||
:max="maxExpirationDateEnforced"
|
||||
:hide-label="true"
|
||||
:disabled="isExpiryDateEnforced"
|
||||
:placeholder="t('files_sharing', 'Expiration date')"
|
||||
type="date"
|
||||
@input="onExpirationChange" />
|
||||
|
|
@ -418,11 +417,16 @@ export default {
|
|||
isFolder() {
|
||||
return this.fileInfo.type === 'dir'
|
||||
},
|
||||
dateMaxEnforced() {
|
||||
if (!this.isRemoteShare && this.config.isDefaultInternalExpireDateEnforced) {
|
||||
return new Date(new Date().setDate(new Date().getDate() + 1 + this.config.defaultInternalExpireDate))
|
||||
} else if (this.config.isDefaultRemoteExpireDateEnforced) {
|
||||
return new Date(new Date().setDate(new Date().getDate() + 1 + this.config.defaultRemoteExpireDate))
|
||||
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) {
|
||||
return this.config.defaultInternalExpirationDate
|
||||
}
|
||||
return null
|
||||
},
|
||||
|
|
|
|||
4
dist/core-common.js
vendored
4
dist/core-common.js
vendored
File diff suppressed because one or more lines are too long
2
dist/core-common.js.map
vendored
2
dist/core-common.js.map
vendored
File diff suppressed because one or more lines are too long
4
dist/files-main.js
vendored
4
dist/files-main.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files-main.js.map
vendored
2
dist/files-main.js.map
vendored
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