extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix not loaded sum-rows, caused by having no row-id

Browse Source
This commit is contained in:
Ralf Becker 2014-01-30 18:47:42 +00:00
parent 968d5d6760
commit 530e9d13e3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,25 +709,27 @@ class timesheet_ui extends timesheet_bo
case 0: // day-sum case 0: // day-sum
$row['ts_title'] = lang('Sum %1:',lang(date('l',$row['ts_start'])).' '.common::show_date($row['ts_start'], $row['ts_title'] = lang('Sum %1:',lang(date('l',$row['ts_start'])).' '.common::show_date($row['ts_start'],
$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false)); $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false));
// For some reason day sum checkbox on the etemplate is checked[1] instead of checked[0] // For some reason day sum checkbox on the etemplate is checked[1] instead of checked[0]
$readonlys["checked[1]"] = true; $readonlys["checked[1]"] = true;
$row['ts_id'] = 'sum-day-'.$row['ts_start'];
break; break;
case -1: // week-sum case -1: // week-sum
$row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4)); $row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4));
$row['ts_id'] = 'sum-week-'.$row['ts_week'];
break; break;
case -2: // month-sum case -2: // month-sum
$row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4)); $row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4));
$row['ts_id'] = 'sum-month-'.$row['ts_month'];
break; break;
case -3: // year-sum case -3: // year-sum
$row['ts_title'] = lang('Sum %1:',$row['ts_year']); $row['ts_title'] = lang('Sum %1:',$row['ts_year']);
$row['ts_id'] = 'sum-year-'.$row['ts_year'];
break; break;
} }
$row['ts_start'] = $row['ts_unitprice'] = ''; $row['ts_start'] = $row['ts_unitprice'] = '';
if (!$this->quantity_sum) $row['ts_quantity'] = ''; if (!$this->quantity_sum) $row['ts_quantity'] = '';
$row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete'; $row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete';
$row['titleClass'] = 'timesheet_titleSum'; $row['titleClass'] = 'timesheet_titleSum';
unset($row['ts_id']); // otherwise row would be selectable action-wise
continue; continue;
} }
if (!$this->check_acl(EGW_ACL_EDIT,$row)) if (!$this->check_acl(EGW_ACL_EDIT,$row))