Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-21 11:25:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: fill date input with default date range

Browse Source
This commit is contained in:
Arpit Jalan 2017-05-22 21:51:22 +05:30
parent 773445b8df
commit decb432740
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/reports.hbs
View File

@ -1,8 +1,8 @@
<h3>{{model.title}}</h3>
<div class="admin-reports-filter">
{{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate}}
{{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate}}
{{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate defaultDate=startDate}}
{{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate defaultDate=endDate}}
{{#if showCategoryOptions}}
{{combo-box valueAttribute="value" content=categoryOptions value=categoryId}}
{{/if}}

3
app/assets/javascripts/discourse/components/date-picker-past.js.es6
View File

@ -5,7 +5,8 @@ export default DatePicker.extend({
_opts() {
return {
defaultDate: new Date(),
defaultDate: new Date(this.get('defaultDate')) || new Date(),
setDefaultDate: !!this.get('defaultDate'),
maxDate: new Date(),
};
}