diff --git a/app/assets/javascripts/discourse/components/date-input.js.es6 b/app/assets/javascripts/discourse/components/date-input.js.es6 index b095781b82d..7d56b964a20 100644 --- a/app/assets/javascripts/discourse/components/date-input.js.es6 +++ b/app/assets/javascripts/discourse/components/date-input.js.es6 @@ -26,6 +26,10 @@ export default Component.extend({ } else { this._loadPikadayPicker(container); } + + if (this.date && this._picker) { + this._picker.setDate(this.date, true); + } }, didUpdateAttrs() { @@ -71,6 +75,9 @@ export default Component.extend({ picker.destroy = () => { /* do nothing for native */ }; + picker.setDate = date => { + picker.value = date; + }; this._picker = picker; }, diff --git a/app/assets/javascripts/discourse/components/date-time-input-range.js.es6 b/app/assets/javascripts/discourse/components/date-time-input-range.js.es6 index ec048ec730d..52438ffd949 100644 --- a/app/assets/javascripts/discourse/components/date-time-input-range.js.es6 +++ b/app/assets/javascripts/discourse/components/date-time-input-range.js.es6 @@ -16,7 +16,7 @@ export default Component.extend({ toPanelActive: equal("currentPanel", "to"), _valid(state) { - if (state.to < state.from) { + if (state.to && state.from && state.to < state.from) { return I18n.t("date_time_picker.errors.to_before_from"); } diff --git a/app/assets/javascripts/discourse/components/date-time-input.js.es6 b/app/assets/javascripts/discourse/components/date-time-input.js.es6 index e9c7ad73975..392dc5dac0f 100644 --- a/app/assets/javascripts/discourse/components/date-time-input.js.es6 +++ b/app/assets/javascripts/discourse/components/date-time-input.js.es6 @@ -7,11 +7,11 @@ export default Component.extend({ showTime: true, _hours: computed("date", function() { - return this.date ? this.date.getHours() : null; + return this.date && this.showTime ? this.date.getHours() : null; }), _minutes: computed("date", function() { - return this.date ? this.date.getMinutes() : null; + return this.date && this.showTime ? this.date.getMinutes() : null; }), actions: { diff --git a/app/assets/javascripts/discourse/controllers/review-index.js.es6 b/app/assets/javascripts/discourse/controllers/review-index.js.es6 index df95f33cfbe..0c9f090aa43 100644 --- a/app/assets/javascripts/discourse/controllers/review-index.js.es6 +++ b/app/assets/javascripts/discourse/controllers/review-index.js.es6 @@ -9,6 +9,8 @@ export default Controller.extend({ "category_id", "topic_id", "username", + "from_date", + "to_date", "sort_order" ], type: null, @@ -19,6 +21,8 @@ export default Controller.extend({ topic_id: null, filtersExpanded: false, username: "", + from_date: null, + to_date: null, sort_order: "priority", init(...args) { @@ -79,6 +83,15 @@ export default Controller.extend({ return filtersExpanded ? "chevron-up" : "chevron-down"; }, + setRange(range) { + if (range.from) { + this.set("from", new Date(range.from).toISOString().split("T")[0]); + } + if (range.to) { + this.set("to", new Date(range.to).toISOString().split("T")[0]); + } + }, + actions: { remove(ids) { if (!ids) { @@ -103,6 +116,8 @@ export default Controller.extend({ status: this.filterStatus, category_id: this.filterCategoryId, username: this.filterUsername, + from_date: this.filterFromDate, + to_date: this.filterToDate, sort_order: this.filterSortOrder }); this.send("refreshRoute"); diff --git a/app/assets/javascripts/discourse/routes/review-index.js.es6 b/app/assets/javascripts/discourse/routes/review-index.js.es6 index d5b2fad3701..2c08fa8ed5f 100644 --- a/app/assets/javascripts/discourse/routes/review-index.js.es6 +++ b/app/assets/javascripts/discourse/routes/review-index.js.es6 @@ -23,6 +23,8 @@ export default DiscourseRoute.extend({ filterPriority: meta.priority, reviewableTypes: meta.reviewable_types, filterUsername: meta.username, + filterFromDate: meta.from_date, + filterToDate: meta.to_date, filterSortOrder: meta.sort_order }); }, diff --git a/app/assets/javascripts/discourse/templates/review-index.hbs b/app/assets/javascripts/discourse/templates/review-index.hbs index 86799229f1b..76f2fe20627 100644 --- a/app/assets/javascripts/discourse/templates/review-index.hbs +++ b/app/assets/javascripts/discourse/templates/review-index.hbs @@ -59,6 +59,10 @@ {{/if}} +