extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 13:39:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix videoconference flag was not passed from quick add to edit dialog

Browse Source
This commit is contained in:
nathangray 2020-04-03 10:59:53 -06:00
parent 610a223c00
commit 16c831ddc3
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/js/app.js
View File

@ -1579,6 +1579,8 @@ var CalendarApp = /** @class */ (function (_super) {
//options.template = 'calendar.add'; //options.template = 'calendar.add';
return this.egw.open(null, 'calendar', 'edit', options, '_blank', 'calendar'); return this.egw.open(null, 'calendar', 'edit', options, '_blank', 'calendar');
} }
// Hold on to options, may have to pass them into edit (rather than all, just send what the programmer wanted)
this.quick_add = options;
// Open dialog to use as target // Open dialog to use as target
var add_dialog = et2_dialog.show_dialog(null, '', ' ', null, [], et2_dialog.PLAIN_MESSAGE, this.egw); var add_dialog = et2_dialog.show_dialog(null, '', ' ', null, [], et2_dialog.PLAIN_MESSAGE, this.egw);
// Call the server, get it into the dialog // Call the server, get it into the dialog
@ -1665,8 +1667,9 @@ var CalendarApp = /** @class */ (function (_super) {
if (title && !title.get_value()) { if (title && !title.get_value()) {
title.set_value(title.egw().lang('Event')); title.set_value(title.egw().lang('Event'));
} }
var options = jQuery.extend(this._add_dialog_values(widget), this.quick_add);
// Open regular edit // Open regular edit
egw.open(null, 'calendar', 'edit', this._add_dialog_values(widget)); egw.open(null, 'calendar', 'edit', options);
// Close the dialog // Close the dialog
jQuery(widget.getInstanceManager().DOMContainer.parentNode).dialog('close'); jQuery(widget.getInstanceManager().DOMContainer.parentNode).dialog('close');
// Do not submit this etemplate // Do not submit this etemplate
@ -1702,7 +1705,10 @@ var CalendarApp = /** @class */ (function (_super) {
values.participants.push(participant.uid); values.participants.push(participant.uid);
} }
} }
return jQuery.extend(values, widget.getInstanceManager().getValues(widget.getRoot())); var send = jQuery.extend(values, widget.getInstanceManager().getValues(widget.getRoot()));
// Don't need the checkbox
delete send.new_event_dialog;
return send;
}; };
/** /**
* Open calendar entry, taking into accout the calendar integration of other apps * Open calendar entry, taking into accout the calendar integration of other apps

11
calendar/js/app.ts
View File

@ -1702,6 +1702,8 @@ class CalendarApp extends EgwApp
//options.template = 'calendar.add'; //options.template = 'calendar.add';
return this.egw.open(null, 'calendar', 'edit', options, '_blank', 'calendar'); return this.egw.open(null, 'calendar', 'edit', options, '_blank', 'calendar');
} }
// Hold on to options, may have to pass them into edit (rather than all, just send what the programmer wanted)
this.quick_add = options;
// Open dialog to use as target // Open dialog to use as target
var add_dialog = et2_dialog.show_dialog(null, '', ' ', null, [], et2_dialog.PLAIN_MESSAGE, this.egw); var add_dialog = et2_dialog.show_dialog(null, '', ' ', null, [], et2_dialog.PLAIN_MESSAGE, this.egw);
@ -1821,9 +1823,10 @@ class CalendarApp extends EgwApp
{ {
title.set_value(title.egw().lang('Event')); title.set_value(title.egw().lang('Event'));
} }
let options = jQuery.extend(this._add_dialog_values(widget), this.quick_add);
// Open regular edit // Open regular edit
egw.open(null,'calendar','edit',this._add_dialog_values(widget)); egw.open(null,'calendar','edit',options);
// Close the dialog // Close the dialog
jQuery(widget.getInstanceManager().DOMContainer.parentNode).dialog('close'); jQuery(widget.getInstanceManager().DOMContainer.parentNode).dialog('close');
@ -1868,10 +1871,14 @@ class CalendarApp extends EgwApp
values.participants.push(participant.uid); values.participants.push(participant.uid);
} }
} }
return jQuery.extend( let send = jQuery.extend(
values, values,
widget.getInstanceManager().getValues(widget.getRoot()) widget.getInstanceManager().getValues(widget.getRoot())
); );
// Don't need the checkbox
delete send.new_event_dialog;
return send;
} }
/** /**