extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-15 07:58:23 +01: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 e2dcaeeaee
commit f91bf7ea4e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/app.js
View File

@ -1709,11 +1709,15 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
else if (template)
{
// 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',
'/index.php',
data
),
850, 300,