mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
run same logic for timer timesheets started on an other app's entry, as used for timesheets manually booked on them
This commit is contained in:
parent
b1538e6dd2
commit
693cf1f116
@ -111,6 +111,13 @@ class timesheet_ui extends timesheet_bo
|
|||||||
foreach($pending as $event)
|
foreach($pending as $event)
|
||||||
{
|
{
|
||||||
if (!empty($event['tse_app']) && $event['tse_app'] !== TIMESHEET_APP && !empty($event['tse_app_id']))
|
if (!empty($event['tse_app']) && $event['tse_app'] !== TIMESHEET_APP && !empty($event['tse_app_id']))
|
||||||
|
{
|
||||||
|
if (!isset($_REQUEST['link_app']))
|
||||||
|
{
|
||||||
|
$_REQUEST['link_app'] = $event['tse_app'];
|
||||||
|
$_REQUEST['link_id'] = $event['tse_app_id'];
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
if (!isset($this->data['link_to']['to_id']))
|
if (!isset($this->data['link_to']['to_id']))
|
||||||
{
|
{
|
||||||
@ -120,6 +127,7 @@ class timesheet_ui extends timesheet_bo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (!empty($this->data['events']))
|
if (!empty($this->data['events']))
|
||||||
{
|
{
|
||||||
array_unshift($this->data['events'], false);
|
array_unshift($this->data['events'], false);
|
||||||
|
Loading…
Reference in New Issue
Block a user