From 213981284929ceeb98bd996d1ac9ee74dd6c91eb Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 25 Aug 2014 19:56:28 +0000
Subject: [PATCH] Fix missing duration format by setting it once at the top
 level. (see r47942)

---
 infolog/inc/class.infolog_ui.inc.php |  2 +-
 infolog/templates/default/index.xet  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index df352efede..3682f89b7d 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -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;
 
diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 4f848e91b0..3f3626b60c 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -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>