From decb43274019ec4a9f1f4a633e7416f13b7fabff Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 22 May 2017 21:51:22 +0530
Subject: [PATCH] FIX: fill date input with default date range

---
 app/assets/javascripts/admin/templates/reports.hbs            | 4 ++--
 .../javascripts/discourse/components/date-picker-past.js.es6  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs
index 048ff284bd7..57acba8f502 100644
--- a/app/assets/javascripts/admin/templates/reports.hbs
+++ b/app/assets/javascripts/admin/templates/reports.hbs
@@ -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}}
diff --git a/app/assets/javascripts/discourse/components/date-picker-past.js.es6 b/app/assets/javascripts/discourse/components/date-picker-past.js.es6
index 5e9a3ab8311..6c4a3b0040a 100644
--- a/app/assets/javascripts/discourse/components/date-picker-past.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker-past.js.es6
@@ -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(),
     };
   }