[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[34824] branches/experimental/foreign-storage

[<lph...@us...>]

Revision: 34824
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34824&view=rev
Author:   lphuberdeau
Date:     2011-06-08 13:21:42 +0000 (Wed, 08 Jun 2011)

Log Message:
-----------
[MOD] Modifying the item link field to store the itemId instead of the linked value for edit/display

Modified Paths:
--------------
    branches/experimental/foreign-storage/lib/core/Tracker/Field/ItemLink.php
    branches/experimental/foreign-storage/templates/trackerinput/itemlink.tpl

Modified: branches/experimental/foreign-storage/lib/core/Tracker/Field/ItemLink.php
===================================================================
--- branches/experimental/foreign-storage/lib/core/Tracker/Field/ItemLink.php	2011-06-08 12:55:16 UTC (rev 34823)
+++ branches/experimental/foreign-storage/lib/core/Tracker/Field/ItemLink.php	2011-06-08 13:21:42 UTC (rev 34824)
@@ -19,10 +19,6 @@
 
 		$value = $data['value'];
 
-		if ($value) {
-			$data["linkId"] = TikiLib::lib('trk')->get_item_id($this->getOption(0), $this->getOption(1), $value);
-		}
-
 		return $data;
 	}
 
@@ -35,12 +31,13 @@
 	{
 		$smarty = TikiLib::lib('smarty');
 
-		$item = $this->getConfiguration('linkId');
+		$item = $this->getConfiguration('value');
 		$dlist = $this->getConfiguration('listdisplay');
+		$list = $this->getConfiguration('list');
 		if (!empty($dlist)) {
 			$label = $dlist[$item];
 		} else {
-			$label = $this->getConfiguration('value');
+			$label = $list[$item];
 		}
 		if ($item && $context['list_mode'] !== 'csv' && $this->getOption(2)) {
 			require_once $smarty->_get_plugin_filepath('function', 'object_link');

Modified: branches/experimental/foreign-storage/templates/trackerinput/itemlink.tpl
===================================================================
--- branches/experimental/foreign-storage/templates/trackerinput/itemlink.tpl	2011-06-08 12:55:16 UTC (rev 34823)
+++ branches/experimental/foreign-storage/templates/trackerinput/itemlink.tpl	2011-06-08 13:21:42 UTC (rev 34824)
@@ -3,8 +3,12 @@
 		<option value=""></option>
 	{/if}
 	{foreach key=id item=label from=$field.list}
-		<option value="{$label|escape}" {if $field.value eq $label or $defaultvalues.$fid eq $label or $field.defaultvalue eq $label}selected="selected"{/if}>
-			{if $field.listdisplay[$id] eq ""}{$label}{else}{$field.listdisplay[$id]}{/if}
+		<option value="{$id|escape}" {if $field.value eq $id}selected="selected"{/if}>
+			{if $field.listdisplay[$id] eq ""}
+				{$label|escape}
+			{else}
+				{$field.listdisplay[$id]|escape}
+			{/if}
 		</option>
 	{/foreach}
 </select>


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