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

* Calendar - Open timesheet from recurring event on selected occurence instead of first occurence

Browse Source
This commit is contained in:
nathangray 2018-06-08 11:32:38 -06:00
parent 67d8166b27
commit bc43d93950
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -933,7 +933,7 @@ class calendar_uiviews extends calendar_ui
}
if ($actions['timesheet'])
{
$actions['timesheet']['open'] = '{"app": "timesheet", "type": "add", "extra": "link_app[]=$app&link_id[]=$id"}';
$actions['timesheet']['open'] = '{"app": "timesheet", "type": "add", "extra": "link_app[]=$app&link_id[]=$app_id"}';
$actions['timesheet']['onExecute'] = 'javaScript:app.calendar.action_open';
}
if ($actions['documents'])

4
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -373,6 +373,10 @@ class timesheet_ui extends timesheet_bo
}
break;
}
if($link_app == 'calendar')
{
list($link_id) = explode(':', $link_id);
}
Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link_app,$link_id);
}
}