Fix expiry datepicker allowing all dates
vue2-datepicker expects a `disabled-date` function rather than `not-before` and `not-after` dates. This commit updates it so that we now provide vue2-datepicker with a `disabled-date` function. Signed-off-by: Gary Kim <gary@garykim.dev>
This commit is contained in:
parent
e77e0b0e2f
commit
8dd23f9854
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -95,8 +95,7 @@
|
||||||
value-type="format"
|
value-type="format"
|
||||||
icon="icon-calendar-dark"
|
icon="icon-calendar-dark"
|
||||||
type="date"
|
type="date"
|
||||||
:not-before="dateTomorrow"
|
:disabled-date="disabledDate"
|
||||||
:not-after="dateMaxEnforced"
|
|
||||||
@update:value="onExpirationChange">
|
@update:value="onExpirationChange">
|
||||||
{{ t('files_sharing', 'Enter a date') }}
|
{{ t('files_sharing', 'Enter a date') }}
|
||||||
</ActionInput>
|
</ActionInput>
|
||||||
|
|
|
@ -105,8 +105,7 @@
|
||||||
icon=""
|
icon=""
|
||||||
type="date"
|
type="date"
|
||||||
value-type="format"
|
value-type="format"
|
||||||
:not-before="dateTomorrow"
|
:disabled-date="disabledDate">
|
||||||
:not-after="dateMaxEnforced">
|
|
||||||
<!-- let's not submit when picked, the user
|
<!-- let's not submit when picked, the user
|
||||||
might want to still edit or copy the password -->
|
might want to still edit or copy the password -->
|
||||||
{{ t('files_sharing', 'Enter a date') }}
|
{{ t('files_sharing', 'Enter a date') }}
|
||||||
|
@ -231,8 +230,7 @@
|
||||||
value-type="format"
|
value-type="format"
|
||||||
icon="icon-calendar-dark"
|
icon="icon-calendar-dark"
|
||||||
type="date"
|
type="date"
|
||||||
:not-before="dateTomorrow"
|
:disabled-date="disabledDate"
|
||||||
:not-after="dateMaxEnforced"
|
|
||||||
@update:value="onExpirationChange">
|
@update:value="onExpirationChange">
|
||||||
{{ t('files_sharing', 'Enter a date') }}
|
{{ t('files_sharing', 'Enter a date') }}
|
||||||
</ActionInput>
|
</ActionInput>
|
||||||
|
|
|
@ -300,5 +300,16 @@ export default {
|
||||||
debounceQueueUpdate: debounce(function(property) {
|
debounceQueueUpdate: debounce(function(property) {
|
||||||
this.queueUpdate(property)
|
this.queueUpdate(property)
|
||||||
}, 500),
|
}, 500),
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns which dates are disabled for the datepicker
|
||||||
|
* @param {Date} date date to check
|
||||||
|
* @returns {boolean}
|
||||||
|
*/
|
||||||
|
disabledDate(date) {
|
||||||
|
const dateMoment = moment(date)
|
||||||
|
return (this.dateTomorrow && dateMoment.isBefore(this.dateTomorrow, 'day'))
|
||||||
|
|| (this.dateMaxEnforced && dateMoment.isSameOrAfter(this.dateMaxEnforced, 'day'))
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue