github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 10:32:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: regression preventing to set number of hours before closing

Browse Source 
This commit also adds a full test suite for editing topic timer.
This commit is contained in:
Joffrey JAFFEUX
2017-11-24 02:48:45 +01:00
committed by GitHub
parent 82222e8d18
commit 63307c303a
3 changed files with 156 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
View File

@ -114,6 +114,7 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
pluginApiIdentifiers: ["future-date-input-selector"],
classNames: ["future-date-input-selector"],
isCustom: Ember.computed.equal("value", "pick_date_and_time"),
isBasedOnLastPost: Ember.computed.equal("value", "set_based_on_last_post"),
clearable: true,
rowComponent: "future-date-input-selector/future-date-input-selector-row",
headerComponent: "future-date-input-selector/future-date-input-selector-header",
@ -154,7 +155,7 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
},
mutateValue(value) {
if (this.get("isCustom")) {
if (this.get("isCustom") || this.get("isBasedOnLastPost")) {
this.set("value", value);
} else {
let input = null;