holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar: Fix quick add did not open conflict dialog

Browse Source
This commit is contained in:
nathangray 2020-09-15 10:43:08 -06:00
parent 1ae7549b7a
commit e7a918c158
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/js/app.js
View File

@ -1714,7 +1714,7 @@ var CalendarApp = /** @class */ (function (_super) {
this.dialog.destroy(); this.dialog.destroy();
delete app.calendar.quick_add; delete app.calendar.quick_add;
} }
else if (template) { else if (template || (template = etemplate2_1.etemplate2.getById("calendar-conflicts"))) {
// Open conflicts // Open conflicts
var data = jQuery.extend({ menuaction: 'calendar.calendar_uiforms.ajax_conflicts' }, 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', data), 850, 300, 'conflicts', 'calendar'); egw.openPopup(egw.link('/index.php', data), 850, 300, 'conflicts', 'calendar');

2
calendar/js/app.ts
View File

@ -1870,7 +1870,7 @@ class CalendarApp extends EgwApp
this.dialog.destroy(); this.dialog.destroy();
delete app.calendar.quick_add; delete app.calendar.quick_add;
} }
else if (template) else if (template || (template = etemplate2.getById("calendar-conflicts")))
{ {
// Open conflicts // Open conflicts
var data = jQuery.extend( var data = jQuery.extend(