[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[38062] branches/8.x

[<jon...@us...>]

Revision: 38062
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=38062&view=rev
Author:   jonnybradley
Date:     2011-10-07 16:57:06 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
[FIX] trackers: Simple formatting for CSV export on numeric, files and relation fields

Modified Paths:
--------------
    branches/8.x/lib/core/Tracker/Field/Files.php
    branches/8.x/lib/core/Tracker/Field/Relation.php
    branches/8.x/templates/trackeroutput/numeric.tpl

Modified: branches/8.x/lib/core/Tracker/Field/Files.php
===================================================================
--- branches/8.x/lib/core/Tracker/Field/Files.php	2011-10-07 15:44:22 UTC (rev 38061)
+++ branches/8.x/lib/core/Tracker/Field/Files.php	2011-10-07 16:57:06 UTC (rev 38062)
@@ -103,7 +103,11 @@
 
 	function renderOutput($context = array())
 	{
-		return $this->renderTemplate('trackeroutput/files.tpl', $context);
+		if ($context['list_mode'] === 'csv') {
+			return $this->getConfiguration('value');
+		} else {
+			return $this->renderTemplate('trackeroutput/files.tpl', $context);
+		}
 	}
 
 	function handleSave($value, $oldValue)

Modified: branches/8.x/lib/core/Tracker/Field/Relation.php
===================================================================
--- branches/8.x/lib/core/Tracker/Field/Relation.php	2011-10-07 15:44:22 UTC (rev 38061)
+++ branches/8.x/lib/core/Tracker/Field/Relation.php	2011-10-07 16:57:06 UTC (rev 38062)
@@ -114,7 +114,11 @@
 
 	function renderOutput($context = array())
 	{
-		return $this->renderTemplate('trackeroutput/relation.tpl', $context);
+		if ($context['list_mode'] === 'csv') {
+			return $this->getConfiguration('value');
+		} else {
+			return $this->renderTemplate('trackeroutput/relation.tpl', $context);
+		}
 	}
 
 	function handleSave($value, $oldValue)

Modified: branches/8.x/templates/trackeroutput/numeric.tpl
===================================================================
--- branches/8.x/templates/trackeroutput/numeric.tpl	2011-10-07 15:44:22 UTC (rev 38061)
+++ branches/8.x/templates/trackeroutput/numeric.tpl	2011-10-07 16:57:06 UTC (rev 38062)
@@ -1,6 +1,6 @@
 {strip}
 {if $field.value}
-	{if $field.options_array[2]}
+	{if $context.list_mode neq 'csv' and $field.options_array[2]}
 		<span class="formunit">{$field.options_array[2]|escape}</span>
 	{/if}
 
@@ -14,7 +14,7 @@
 		{$field.value|number_format:$field.options_array[4]:$field.options_array[5]:$field.options_array[6]|escape}
 	{/if}
 
-	{if $field.options_array[3]}
+	{if $context.list_mode neq 'csv' and $field.options_array[3]}
 		<span class="formunit">{$field.options_array[3]|escape}</span>
 	{/if}
 {/if}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.