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

Backport commit r48261, committed by Nathan Gray. Fix missing duration format by setting it once at the top level. (see r47942)

Browse Source
This commit is contained in:
Hadi Nategh 2014-08-26 13:47:42 +00:00
parent 739d2406bc
commit fce681e71c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infolog/inc/class.infolog_ui.inc.php
View File

@ -475,7 +475,6 @@ class infolog_ui
if ($query['cat_id']) $rows['no_cat_id'] = true;
if ($query['no_actions']) $rows['no_actions'] = true;
$rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
$rows['duration_format'] = ','.$this->duration_format.',,1';
// switch cf column off, if we have no cf's
if (!$query['custom_fields']) $rows['no_customfields'] = true;
@ -906,6 +905,7 @@ class infolog_ui
$values['action'] = $persist['action'] = $values['nm']['action'] = $action;
$values['action_id'] = $persist['action_id'] = $values['nm']['action_id'] = $action_id;
$values['action_title'] = $persist['action_title'] = $values['nm']['action_title'] = $action_title;
$values['duration_format'] = ','.$this->duration_format;
$persist['called_as'] = $called_as;
$persist['own_referer'] = $own_referer;

14
infolog/templates/default/index.xet
View File

@ -107,26 +107,26 @@
<vbox>
<hbox readonly="true">
<hbox readonly="true">
<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
<date-duration id="${row}[info_used_time]" readonly="true" options="@@duration_format"/>
<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@@duration_format" class="timesheet"/>
</hbox>
<description/>
</hbox>
<date-duration id="${row}[info_planned_time]" readonly="true" options="@duration_format" span="all" class="infolog_planned"/>
<date-duration id="${row}[info_planned_time]" readonly="true" options="@@duration_format" span="all" class="infolog_planned"/>
</vbox>
<vbox>
<hbox id="r_used_time">
<image label="Times" src="timesheet"/>
<date-duration id="${row}[info_used_time]" readonly="true" options="@duration_format"/>
<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@duration_format" class="timesheet"/>
<date-duration id="${row}[info_used_time]" readonly="true" options="@@duration_format"/>
<date-duration id="${row}[info_sum_timesheets]" readonly="true" options="@@duration_format" class="timesheet"/>
</hbox>
<hbox id="planified">
<image label="planned time" src="k_alarm.png"/>
<date-duration id="${row}[info_planned_time]" readonly="true" options="@duration_format" span="all" class="infolog_planned"/>
<date-duration id="${row}[info_planned_time]" readonly="true" options="@@duration_format" span="all" class="infolog_planned"/>
</hbox>
<hbox id="replanified">
<image label="Re-planned time" src="agt_reload.png"/>
<date-duration id="${row}[info_replanned_time]" readonly="true" options="@duration_format" span="all" class="replanned"/>
<date-duration id="${row}[info_replanned_time]" readonly="true" options="@@duration_format" span="all" class="replanned"/>
</hbox>
</vbox>
<vbox>