diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index 8e751b4f4b..e71bcf7e65 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -965,19 +965,6 @@ class calendar_uiviews extends calendar_ui $actions['infolog_app']['open'] = '{"app": "infolog", "type": "add", "extra": "type=task&action=$app&action_id=$id"}'; $actions['infolog_app']['onExecute'] = 'javaScript:app.calendar.action_open'; } - // Get documents working with other views - $set_execute = function(&$action) use (&$set_execute) - { - $action['onExecute'] = 'javaScript:app.calendar.action_merge'; - if (!empty($action['children'])) - { - foreach($action['children'] as &$child) - { - $set_execute($child); - } - } - }; - $set_execute($actions['documents']); $actions['ical']['onExecute'] = 'javaScript:app.calendar.ical'; $actions['delete']['onExecute'] = 'javaScript:app.calendar.delete'; diff --git a/calendar/js/app.ts b/calendar/js/app.ts index c6dc25f258..0f567257ea 100644 --- a/calendar/js/app.ts +++ b/calendar/js/app.ts @@ -2472,25 +2472,6 @@ export class CalendarApp extends EgwApp ).sendRequest(); } - /** - * Insert selected event(s) into a document - * - * Actually, just pass it off to the nextmatch - * - * @param {egwAction} _action - * @param {egwActionObject[]} _selected - */ - action_merge(_action, _selected) - { - var ids = {ids:[]}; - for(var i = 0; i < _selected.length; i++) - { - ids.ids.push(_selected[i].id); - } - nm_action(egw_getActionManager(this.appname,false,1) - .getActionById('nm').getActionById(_action.id), _selected, null, ids); - } - /** * Sidebox merge *