From 321fe6a474fb54c633aa83a2c5efdd72f05c6135 Mon Sep 17 00:00:00 2001 From: nathangray Date: Fri, 16 Apr 2021 09:15:13 -0600 Subject: [PATCH] * Calendar: Fix quick-add did not pass changes to start time on to edit dialog --- calendar/js/app.js | 2 +- calendar/js/app.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/js/app.js b/calendar/js/app.js index 7e438bc4c5..1d537f7ca5 100644 --- a/calendar/js/app.js +++ b/calendar/js/app.js @@ -1925,7 +1925,7 @@ var CalendarApp = /** @class */ (function (_super) { if (title && !title.get_value()) { title.set_value(title.egw().lang('Event')); } - var options = jQuery.extend(this._add_dialog_values(widget), this.quick_add); + var options = jQuery.extend(this.quick_add, this._add_dialog_values(widget)); // Open regular edit egw.open(null, 'calendar', 'edit', options); // Close the dialog diff --git a/calendar/js/app.ts b/calendar/js/app.ts index 6859a9403b..1087957858 100644 --- a/calendar/js/app.ts +++ b/calendar/js/app.ts @@ -2158,7 +2158,7 @@ class CalendarApp extends EgwApp { title.set_value(title.egw().lang('Event')); } - let options = jQuery.extend(this._add_dialog_values(widget), this.quick_add); + let options = jQuery.extend(this.quick_add, this._add_dialog_values(widget)); // Open regular edit egw.open(null,'calendar','edit',options);