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

FIX: Client not setting TopicTimer#based_on_last_post.

Browse Source 
https://meta.discourse.org/t/incorrect-message-key-in-temporarily-closed-topic/87773
This commit is contained in:
Guo Xiang Tan
2018-05-18 16:30:59 +08:00
parent 3287f47f07
commit 2fecb4b46e
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
View File

@ -46,5 +46,12 @@ export default Ember.Component.extend({
} }
this.set("topicTimer.updateTime", time); this.set("topicTimer.updateTime", time);
},
@observes("selection")
_updateBasedOnLastPost() {
if (!this.get('autoClose')) {
this.set('topicTimer.based_on_last_post', false);
} }
},
}); });

1
app/assets/javascripts/discourse/components/topic-timer-info.js.es6
View File

@ -18,7 +18,6 @@ export default Ember.Component.extend(bufferedRender({
if (!this.get('executeAt')) return; if (!this.get('executeAt')) return;
let statusUpdateAt = moment(this.get('executeAt')); let statusUpdateAt = moment(this.get('executeAt'));
if (statusUpdateAt < new Date()) return;
let duration = moment.duration(statusUpdateAt - moment()); let duration = moment.duration(statusUpdateAt - moment());
let minutesLeft = duration.asMinutes(); let minutesLeft = duration.asMinutes();

4
app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
View File

@ -9,7 +9,7 @@
input=topicTimer.updateTime input=topicTimer.updateTime
statusType=selection statusType=selection
includeWeekend=true includeWeekend=true
basedOnLastPost=false}} basedOnLastPost=topicTimer.based_on_last_post}}
{{else if publishToCategory}} {{else if publishToCategory}}
<div class="control-group"> <div class="control-group">
<label>{{i18n 'topic.topic_status_update.publish_to'}}</label> <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
@ -23,7 +23,7 @@
statusType=selection statusType=selection
includeWeekend=true includeWeekend=true
categoryId=topicTimer.category_id categoryId=topicTimer.category_id
basedOnLastPost=false}} basedOnLastPost=topicTimer.based_on_last_post}}
{{else if autoClose}} {{else if autoClose}}
{{future-date-input {{future-date-input
input=topicTimer.updateTime input=topicTimer.updateTime

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

@ -155,7 +155,7 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
}, },
mutateValue(value) { mutateValue(value) {
if (this.get("isCustom") || this.get("isBasedOnLastPost")) { if (value === 'pick_date_and_time' || this.get("isBasedOnLastPost")) {
this.set("value", value); this.set("value", value);
} else { } else {
let input = null; let input = null;