extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 20:49:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix inserting event into document using context menu

Browse Source
This commit is contained in:
nathan 2022-08-18 15:41:05 -06:00
parent 4318d1c0a5
commit 3038ebcefd
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -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']['open'] = '{"app": "infolog", "type": "add", "extra": "type=task&action=$app&action_id=$id"}';
$actions['infolog_app']['onExecute'] = 'javaScript:app.calendar.action_open'; $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['ical']['onExecute'] = 'javaScript:app.calendar.ical';
$actions['delete']['onExecute'] = 'javaScript:app.calendar.delete'; $actions['delete']['onExecute'] = 'javaScript:app.calendar.delete';

19
calendar/js/app.ts
View File

@ -2472,25 +2472,6 @@ export class CalendarApp extends EgwApp
).sendRequest(); ).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 * Sidebox merge
* *