From: <jon...@us...> - 2010-08-03 15:51:04
|
Revision: 28285 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28285&view=rev Author: jonnybradley Date: 2010-08-03 15:50:57 +0000 (Tue, 03 Aug 2010) Log Message: ----------- [FIX] Tracker plugin: Use tracker_item_field_input.tpl like other fields for user type 1 fields so the description also appears. Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_tracker.php Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_tracker.php 2010-08-03 15:46:36 UTC (rev 28284) +++ trunk/lib/wiki-plugins/wikiplugin_tracker.php 2010-08-03 15:50:57 UTC (rev 28285) @@ -1075,20 +1075,8 @@ } $backLength0 = strlen($back); foreach ($flds['data'] as $f) { - if ($f['type'] == 'u' and $f['options_array'][0] == '1') { - if (!in_array($f['fieldId'], $outf)) { // if not in fields list use a hidden input - $back.= '<input type="hidden" name="authorfieldid" value="'.$f['fieldId'].'" />'; - } else { - include_once $smarty->_get_plugin_filepath('function', 'user_selector'); - $back .= '<tr><td>' . wikiplugin_tracker_name($f['fieldId'], tra($f['name']), $field_errors) . '</td><td>'; - $back .= smarty_function_user_selector(array( - 'user' => $f['value'], - 'name' => 'authorfieldid', - 'id' => 'authorfieldid', - 'editable' => $tiki_p_admin_trackers, - ), $smarty); - $back .= '</td></tr>'; - } + if ($f['type'] == 'u' && $f['options_array'][0] == '1' && !in_array($f['fieldId'], $outf)) { + $back.= '<input type="hidden" name="authorfieldid" value="'.$f['fieldId'].'" />'; } elseif ($f['type'] == 'I' and $f['options_array'][0] == '1') { $back.= '<input type="hidden" name="authoripid" value="'.$f['fieldId'].'" />'; } elseif ($f['type'] == 'g' and $f['options_array'][0] == '1') { @@ -1113,18 +1101,21 @@ $f['name'] = "<i>".$f['name']."</i>"; } if ($f['type'] != 'h') { - $back.= "<tr><td"; - if (!empty($colwidth)){ - $back .= " width='".$colwidth."'"; - } - $back .= ">".wikiplugin_tracker_name($f['fieldId'], tra($f['name']), $field_errors); - if ($showmandatory == 'y' and $f['isMandatory'] == 'y') { - $back.= " <strong class='mandatory_star'>*</strong> "; - } - $back.= "</td><td>"; + $back.= "<tr><td"; + if (!empty($colwidth)){ + $back .= " width='".$colwidth."'"; + } + $back .= ">".wikiplugin_tracker_name($f['fieldId'], tra($f['name']), $field_errors); + if ($showmandatory == 'y' and $f['isMandatory'] == 'y') { + $back.= " <strong class='mandatory_star'>*</strong> "; + } + $back.= "</td><td>"; } else { - $back .= "<tr><th colspan='2'>".wikiplugin_tracker_name($f['fieldId'], tra($f['name']), $field_errors); + $back .= "<tr><th colspan='2'>".wikiplugin_tracker_name($f['fieldId'], tra($f['name']), $field_errors); } + if ($f['type'] == 'u' && $f['options_array'][0] == '1') { + $f['ins_id'] = 'authorfieldid'; + } $smarty->assign_by_ref('field_value', $f); if (isset($item)) { $smarty->assign_by_ref('item', $item); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |