extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: Fix conflict popup opened with an error

Browse Source
This commit is contained in:
nathangray 2020-04-08 14:13:07 -06:00
parent 8476a0cd35
commit 840f195288
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/app.js
View File

@ -1625,8 +1625,8 @@ var CalendarApp = /** @class */ (function (_super) {
} }
else if (template) { else if (template) {
// Open conflicts // Open conflicts
var data = jQuery.extend({}, template.widgetContainer.getArrayMgr('content').data, app.calendar.quick_add); var data = jQuery.extend({ menuaction: 'calendar.calendar_uiforms.ajax_conflicts' }, template.widgetContainer.getArrayMgr('content').data, app.calendar.quick_add);
egw.openPopup(egw.link('/index.php?menuaction=calendar.calendar_uiforms.ajax_conflicts', data), 850, 300, 'conflicts', 'calendar'); egw.openPopup(egw.link('/index.php', data), 850, 300, 'conflicts', 'calendar');
delete app.calendar.quick_add; delete app.calendar.quick_add;
// Close the JS dialog // Close the JS dialog
this.dialog.destroy(); this.dialog.destroy();

8
calendar/js/app.ts
View File

@ -1760,11 +1760,15 @@ class CalendarApp extends EgwApp
else if (template) else if (template)
{ {
// Open conflicts // Open conflicts
var data = jQuery.extend({},template.widgetContainer.getArrayMgr('content').data, app.calendar.quick_add); var data = jQuery.extend(
{menuaction: 'calendar.calendar_uiforms.ajax_conflicts'},
template.widgetContainer.getArrayMgr('content').data,
app.calendar.quick_add
);
egw.openPopup( egw.openPopup(
egw.link( egw.link(
'/index.php?menuaction=calendar.calendar_uiforms.ajax_conflicts', '/index.php',
data data
), ),
850, 300, 850, 300,