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: recurring was not working for some cases (eg: hours and unit > 1) (#11657)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2021-01-07 12:21:51 +01:00
committed by GitHub
parent 0c451d14d9
commit 49f4c75080
4 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/discourse-local-dates/assets/javascripts/lib/local-date-builder.js.es6
View File

@ -48,14 +48,14 @@ export default class LocalDateBuilder {
});
if (this.recurring && moment().isAfter(localDate.datetime)) {
const [count, type] = this.recurring.split(".");
const type = this.recurring.split(".")[1];
const repetitionsForType = localDate.repetitionsBetweenDates(
const repetitionsForType = localDate.unitRepetitionsBetweenDates(
this.recurring,
moment.tz(this.localTimezone)
);
localDate = localDate.add(repetitionsForType + parseInt(count, 10), type);
localDate = localDate.add(repetitionsForType, type);
}
const previews = this._generatePreviews(localDate, displayedTimezone);