EVOgeek/Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3909 calendar: Fix default reminder duplicated when editing

Browse Source
This commit is contained in:
Dani Palou 2022-03-15 15:25:07 +01:00
parent 1db5b85e40
commit c0b170b5f0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/addons/calendar/pages/edit-event/edit-event.page.ts
View File

@ -520,7 +520,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
try { try {
const result = await AddonCalendar.submitEvent(this.eventId, data, { const result = await AddonCalendar.submitEvent(this.eventId, data, {
reminders: this.reminders, reminders: this.eventId ? [] : this.reminders, // Only allow adding reminders for new events.
}); });
event = result.event; event = result.event;
@ -638,7 +638,8 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
* @return Promise resolved when done. * @return Promise resolved when done.
*/ */
protected async initReminders(): Promise<void> { protected async initReminders(): Promise<void> {
if (!this.notificationsEnabled) { // Don't init reminders when editing an event. Right now, only allow adding reminders for new events.
if (!this.notificationsEnabled || this.eventId) {
return; return;
} }

4
src/addons/calendar/services/calendar.ts
View File

@ -1696,7 +1696,7 @@ export class AddonCalendarProvider {
const event = await AddonCalendarOffline.saveEvent(eventId, formData, siteId); const event = await AddonCalendarOffline.saveEvent(eventId, formData, siteId);
// Now save the reminders if any. // Now save the reminders if any.
if (options.reminders) { if (options.reminders?.length) {
await CoreUtils.ignoreErrors( await CoreUtils.ignoreErrors(
Promise.all(options.reminders.map((reminder) => this.addEventReminder(event, reminder.time, siteId))), Promise.all(options.reminders.map((reminder) => this.addEventReminder(event, reminder.time, siteId))),
); );
@ -1718,7 +1718,7 @@ export class AddonCalendarProvider {
const event = await this.submitEventOnline(eventId, formData, siteId); const event = await this.submitEventOnline(eventId, formData, siteId);
// Now save the reminders if any. // Now save the reminders if any.
if (options.reminders) { if (options.reminders?.length) {
await CoreUtils.ignoreErrors( await CoreUtils.ignoreErrors(
Promise.all(options.reminders.map((reminder) => this.addEventReminder(event, reminder.time, siteId))), Promise.all(options.reminders.map((reminder) => this.addEventReminder(event, reminder.time, siteId))),
); );