--- c:\wwwroot\portalbu\templates\wiki-plugins\wikiplugin_trackerfilter.tpl 2007-03-30 13:53:00.000000000 -0500
+++ c:\wwwroot\portal\templates\wiki-plugins\wikiplugin_trackerfilter.tpl 2007-09-05 10:28:00.406250000 -0400
@@ -18,6 +18,8 @@
{/section}
{if $filters[if].format eq "m"} {tr}Tip: hold down CTRL to select multiple{/tr}{/if}
+ {elseif $filters[if].format eq 'r'}
+
{else}
{tr}Any{/tr}
{section name=io loop=$filters[if].opts}
--- c:\wwwroot\portalbu\lib\trackers\trackerlib.php 2007-08-14 11:22:40.843750000 -0400
+++ c:\wwwroot\portal\lib\trackers\trackerlib.php 2007-09-05 10:26:38.640625000 -0400
@@ -715,7 +715,7 @@
$mid .= " ) ";
$mid .= " and ttif$suffix.`fieldId`=? ";
$bindvars[] = $filterfield;
- } else if ($exactvalue) {
+ } elseif ($exactvalue && $filter['type'] != 'a' ) {
if (is_array($exactvalue)) {
$mid .= " and ttif$suffix.`value` in (".implode(',',array_fill(0,count($exactvalue),'?')).")";
$bindvars = array_merge($bindvars, $exactvalue);
@@ -728,6 +728,20 @@
} elseif ($filterfield && $filtervalue) {
$filter = $this->get_tracker_field($filterfield);
$mid.= " and ttif$suffix.`value` like ? ";
+ if (is_array($filtervalue)) {
+ foreach ($filtervalue as $itemId) {
+ if (substr($itemId,0,1) == '*') {
+ $bindvars[] = '%'. substr($itemId,1);
+ } elseif (substr($itemId,-1,1) == '*') {
+ $bindvars[] = substr($itemId,0,strlen($itemId)-1). '%';
+ } else {
+ $bindvars[] = '%'.$itemId.'%';
+ }
+ $mid .= " and ttif$suffix.`fieldId`=? ";
+ $bindvars[] = $filterfield;
+ }
+ } else {
+
if (substr($filtervalue,0,1) == '*') {
$bindvars[] = '%'. substr($filtervalue,1);
} elseif (substr($filtervalue,-1,1) == '*') {
@@ -738,6 +752,7 @@
$mid .= " and ttif$suffix.`fieldId`=? ";
$bindvars[] = $filterfield;
}
+ }
}
function replace_item($trackerId, $itemId, $ins_fields, $status = '', $ins_categs = array(), $bulk_import = false) {
global $user;