From: <jon...@us...> - 2011-03-25 20:20:47
|
Revision: 33666 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33666&view=rev Author: jonnybradley Date: 2011-03-25 20:20:40 +0000 (Fri, 25 Mar 2011) Log Message: ----------- [FIX] trackers: Items list fixes (set up data properly and display info as output and input) Modified Paths: -------------- branches/7.x/lib/core/Tracker/Field/ItemsList.php branches/7.x/templates/trackerinput/itemslist.tpl Modified: branches/7.x/lib/core/Tracker/Field/ItemsList.php =================================================================== --- branches/7.x/lib/core/Tracker/Field/ItemsList.php 2011-03-25 20:19:19 UTC (rev 33665) +++ branches/7.x/lib/core/Tracker/Field/ItemsList.php 2011-03-25 20:20:40 UTC (rev 33666) @@ -18,24 +18,30 @@ $ins_id = $this->getInsertId(); $data = array( - 'value' => isset($requestData[$ins_id]) - ? $requestData[$filter_id] - : $this->getValue(), + 'value' => $this->getValue(), ); - if (isset($requestData['trackerId'], $requestData['itemId'])) { + $trackerId = isset($requestData['trackerId']) + ? $requestData['trackerId'] + : $this->getConfiguration('trackerId'); + + $itemId = isset($requestData['itemId']) + ? $requestData['itemId'] + : $this->getItemId(); + + if ( $trackerId && $itemId ) { if ($this->getOption(3)) { $l = explode(':', $this->getOption(1)); $finalFields = explode('|', $this->getOption(3)); $data['links'] = TikiLib::lib('trk')->get_join_values( - $requestData['trackerId'], $requestData['itemId'], + $trackerId, $itemId, array_merge( array($this->getOption(2)), $l, array($this->getOption(3))), $this->getOption(0), $finalFields, ' ', $this->getOption(5) ); if (count($data['links']) == 1) { foreach($data['links'] as $linkItemId => $linkValue) { if (is_numeric($data['links'][$linkItemId])) { // if later a computed field use this field - $info[$this->getConfiguration('fieldId')] = $linkValue; + $info[$this->getConfiguration('fieldId')] = $linkValue; // TODO $info not defined in this scope? } } } @@ -51,5 +57,9 @@ { return $this->renderTemplate('trackerinput/itemslist.tpl', $context); } + + function renderOutput( $context = array() ) { + return $this->renderInput( $context ); + } } Modified: branches/7.x/templates/trackerinput/itemslist.tpl =================================================================== --- branches/7.x/templates/trackerinput/itemslist.tpl 2011-03-25 20:19:19 UTC (rev 33665) +++ branches/7.x/templates/trackerinput/itemslist.tpl 2011-03-25 20:20:40 UTC (rev 33666) @@ -1,11 +1,14 @@ +{strip} {foreach key=tid item=tlabel from=$field.links} <div style="clear:both"> + {if $context.list_mode neq 'y'} <div style="float:right;text-align:right"> <a href="tiki-view_tracker_item.php?trackerId={$field.trackerId}&itemId={$tid}" class="link" title="{tr}View Item{/tr}">{icon _id='magnifier' alt="{tr}View Item{/tr}"}</a> </div> + {/if} <a href="tiki-view_tracker_item.php?trackerId={$field.trackerId}&itemId={$tid}" class="link" title="{tr}View Item{/tr}">{if $tlabel}{$tlabel}{else} {/if}</a></div> {/foreach} -{if $tiki_p_create_tracker_items eq 'y' and !(count($field.links) >= 1 and $field.tracker_options.oneUserItem eq 'y')} +{if $context.list_mode neq 'y' and $tiki_p_create_tracker_items eq 'y' and !(count($field.links) >= 1 and $field.tracker_options.oneUserItem eq 'y')} <div style="clear:both;text-align:right;"> <a href="tiki-view_tracker.php?trackerId={$field.options_array[0]}&vals%5B{$field.options_array[1]}%5D= {assign var="fieldopts" value="|"|explode:$field.options_array[2]} @@ -14,9 +17,7 @@ {$ins_fields[ox].value} {/if} {/section} - ">{tr}Insert New Item{/tr} + ">{tr}Insert New Item{/tr}</a> </div> {/if} - - - +{/strip} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |