osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX: Validate duration minutes values for topic timer (#12040)

Browse Source 
Add server and client side validations to ensure topic timer durations cannot exceed 2 years and cannot be less than or equal to 0.
This commit is contained in:
Martin Brennan
2021-02-12 09:05:14 +10:00
committed by GitHub
parent 24854fcc59
commit ff1ac57feb
6 changed files with 70 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/app/controllers/edit-topic-timer.js
+20 -7
View File
@@ -121,6 +121,9 @@ export default Controller.extend(ModalFunctionality, {
actions: {
onChangeStatusType(value) {
if (value !== CLOSE_STATUS_TYPE) {
this.set("topicTimer.based_on_last_post", false);
}
this.set("topicTimer.status_type", value);
},
@@ -145,14 +148,24 @@ export default Controller.extend(ModalFunctionality, {
if (
this.get("topicTimer.duration_minutes") &&
!this.get("topicTimer.updateTime") &&
this.get("topicTimer.duration_minutes") <= 0
!this.get("topicTimer.updateTime")
) {
this.flash(
I18n.t("topic.topic_status_update.min_duration"),
"alert-error"
);
return;
if (this.get("topicTimer.duration_minutes") <= 0) {
this.flash(
I18n.t("topic.topic_status_update.min_duration"),
"alert-error"
);
return;
}
// cannot be more than 2 years
if (this.get("topicTimer.duration_minutes") > 2 * 365 * 1440) {
this.flash(
I18n.t("topic.topic_status_update.max_duration"),
"alert-error"
);
return;
}
}
this._setTimer(