extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 21:01:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

missing .js file from Nathans merge-edit commit

Browse Source
This commit is contained in:
Ralf Becker 2021-11-27 10:06:57 +02:00
parent 3b8f6c505a
commit 16ef93b1f9
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
calendar/js/app.js
View File

@ -2203,21 +2203,29 @@ var CalendarApp = /** @class */ (function (_super) {
nm.controller._selectionMgr.selectAll(true); nm.controller._selectionMgr.selectAll(true);
} }
if (action && selected) { if (action && selected) {
action.execute(selected); _super.prototype.merge.call(this, action, selected);
} }
} }
else { else {
// Set the hidden inputs to the current time span & submit // Set the hidden inputs to the current time span & submit
widget.getRoot().getWidgetById('first').set_value(app.calendar.state.first); widget.getRoot().getWidgetById('first').set_value(app.calendar.state.first);
widget.getRoot().getWidgetById('last').set_value(app.calendar.state.last); widget.getRoot().getWidgetById('last').set_value(app.calendar.state.last);
if (widget.getRoot().getArrayMgr('content').getEntry('collabora_enabled')) { var vars = {
widget.getInstanceManager().submit(); menuaction: 'calendar.calendar_merge.merge_entries',
} document: widget.getValue(),
else { merge: 'calendar_merge',
widget.getInstanceManager().postSubmit(); pdf: false,
window.setTimeout(function () { widget.set_value(''); }, 100); select_all: false,
} id: JSON.stringify({
first: app.calendar.state.first,
last: app.calendar.state.last,
date: app.calendar.state.first,
view: app.calendar.state.view
})
};
egw.open_link(egw.link('/index.php', vars), '_blank');
} }
widget.set_value('');
return false; return false;
}; };
/** /**