fix merge

This commit is contained in:
Peter Maquiran
2023-07-28 16:28:59 +01:00
parent ac805b67ba
commit 9bebc1b8b6
18 changed files with 37 additions and 28 deletions
@@ -452,7 +452,8 @@ export class EditEventPage implements OnInit {
window['temp.path:/home/agenda/edit-event.component.ts'] = {
postEvent: this._postEvent,
eventBody: this.eventBody,
segment: this.segment
segment: this.segment,
loadedEventAttachments: this.loadedEventAttachments
}
}
@@ -464,6 +465,7 @@ export class EditEventPage implements OnInit {
this._postEvent = restoredData.postEvent
this.eventBody = restoredData.eventBody
this.segment = restoredData.segment
this.loadedEventAttachments = restoredData.loadedEventAttachments
return true;
} else {
@@ -727,7 +727,8 @@ export class NewEventPage implements OnInit {
postEvent: this.postEvent,
eventBody: this.eventBody,
segment: this.segment,
CalendarName: this.CalendarName
CalendarName: this.CalendarName,
documents: this.documents
}
}
@@ -745,6 +746,7 @@ export class NewEventPage implements OnInit {
this.eventBody = restoredData.eventBody
this.segment = restoredData.segment
this.CalendarName = restoredData.CalendarName
this.documents = restoredData.documents
// restore dater for date and hours picker