Fix tracker -> infolog action redirected back to tracker

This commit is contained in:
Nathan Gray 2014-10-22 20:25:48 +00:00
parent 16c902196d
commit 88414a5169

View File

@ -1193,7 +1193,7 @@ class infolog_ui
} }
if ($GLOBALS['egw_info']['user']['apps']['tracker']) if ($GLOBALS['egw_info']['user']['apps']['tracker'])
{ {
$actions['tracker'] = array( $actions['to_tracker'] = array(
'icon' => 'tracker/navbar', 'icon' => 'tracker/navbar',
'caption' => 'Tracker', 'caption' => 'Tracker',
'hint' => 'Convert to a ticket', 'hint' => 'Convert to a ticket',
@ -1892,7 +1892,7 @@ class infolog_ui
); );
} }
// new call via GET or some actions handled here, as they can happen both ways ($_GET[action] or button/action in GUI) // new call via GET or some actions handled here, as they can happen both ways ($_GET[action] or button/action in GUI)
if (!$submit || in_array($action,array('sp','copy','schedule','ical','tracker'))) if (!$submit || in_array($action,array('sp','copy','schedule','ical','to_tracker')))
{ {
switch ($action) switch ($action)
{ {
@ -1920,7 +1920,7 @@ class infolog_ui
} }
unset($action); // it get stored in $content and will cause an other copy after [apply] unset($action); // it get stored in $content and will cause an other copy after [apply]
break; break;
case 'tracker': case 'to_tracker':
egw::redirect_link('/index.php',array( egw::redirect_link('/index.php',array(
'menuaction' => 'tracker.tracker_ui.edit', 'menuaction' => 'tracker.tracker_ui.edit',
egw_link::get_registry('tracker', 'add_app').'[]' => 'infolog', egw_link::get_registry('tracker', 'add_app').'[]' => 'infolog',
@ -2135,7 +2135,7 @@ class infolog_ui
'sp' => 'Sub-entry', 'sp' => 'Sub-entry',
'print' => array('label' => 'Print', 'title' => 'Print this Infolog'), 'print' => array('label' => 'Print', 'title' => 'Print this Infolog'),
'ical' => array('label' => 'Export iCal', 'title' => 'Export iCal'), 'ical' => array('label' => 'Export iCal', 'title' => 'Export iCal'),
'tracker' => array('label' => 'Tracker', 'title' => 'Convert to a ticket'), 'to_tracker' => array('label' => 'Tracker', 'title' => 'Convert to a ticket'),
), ),
); );
if ($GLOBALS['egw_info']['user']['apps']['calendar']) if ($GLOBALS['egw_info']['user']['apps']['calendar'])