github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 02:50:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: correctly pass down calendar options (#26370)

Browse Source 
Prior to this fix the options were not passed down when the user had no default calendar.

No test as it's mostly an interaction between discourse-calendar and core which is hard to test.
This commit is contained in:
Joffrey JAFFEUX 2024-03-26 15:09:05 +01:00 committed by GitHub
parent 9c9526f0a8
commit bddc41b7ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/app/components/modal/download-calendar.js
View File

@ -4,7 +4,7 @@ import { action } from "@ember/object";
import { service } from "@ember/service"; import { service } from "@ember/service";
import { downloadGoogle, downloadIcs } from "discourse/lib/download-calendar"; import { downloadGoogle, downloadIcs } from "discourse/lib/download-calendar";
export default class downloadCalendar extends Component { export default class DownloadCalendar extends Component {
@service currentUser; @service currentUser;
@tracked selectedCalendar = "ics"; @tracked selectedCalendar = "ics";
@ -23,13 +23,19 @@ export default class downloadCalendar extends Component {
downloadIcs( downloadIcs(
this.args.model.calendar.title, this.args.model.calendar.title,
this.args.model.calendar.dates, this.args.model.calendar.dates,
this.args.model.calendar.recurrenceRule {
recurrenceRule: this.args.model.calendar.recurrenceRule,
}
); );
} else { } else {
downloadGoogle( downloadGoogle(
this.args.model.calendar.title, this.args.model.calendar.title,
this.args.model.calendar.dates, this.args.model.calendar.dates,
this.args.model.calendar.recurrenceRule {
recurrenceRule: this.args.model.calendar.recurrenceRule,
location: this.args.model.calendar.location,
details: this.args.model.calendar.details,
}
); );
} }
this.args.closeModal(); this.args.closeModal();