fix problems searching the new custom fields w/dates, RT#8449

diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index 0e34a97..31a9303 100644 (file)
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -29,7 +29,7 @@ share/html/Elements/EditCustomFieldDate #customfield date patch (NEW)
  share/html/Elements/SelectDate
  share/html/Elements/Footer
  html/Ticket/Create.html #XXX TODO
- share/html/Search/Build.html #and customfield date patch
+ share/html/Search/Build.html
  share/html/Search/Elements/PickCFs #customfield date patch
  share/html/Ticket/Display.html
 share/html/Ticket/Elements/AddCustomers

diff --git a/rt/share/html/Search/Build.html b/rt/share/html/Search/Build.html
index f347acd..c5067d5 100644 (file)
--- a/rt/share/html/Search/Build.html
+++ b/rt/share/html/Search/Build.html
@@ -188,7 +188,7 @@ my @new_values = ();
 
 # {{{ Try to find if we're adding a clause
 foreach my $arg ( keys %ARGS ) {
-    next unless $arg =~ m/^ValueOf(\w+|CF.{.*?})$/
+    next unless $arg =~ m/^ValueOf(\w+|'CF.{.*?}')$/
                 && ( ref $ARGS{$arg} eq "ARRAY"
                      ? grep $_ ne '', @{ $ARGS{$arg} }
                      : $ARGS{$arg} ne '' );

diff --git a/rt/share/html/Search/Elements/PickCFs b/rt/share/html/Search/Elements/PickCFs
index 3f6d188..beda9f7 100644 (file)
--- a/rt/share/html/Search/Elements/PickCFs
+++ b/rt/share/html/Search/Elements/PickCFs
@@ -76,7 +76,7 @@ $m->callback(
 my @lines;
 while ( my $CustomField = $CustomFields->Next ) {
     my %line;
-    $line{'Name'} = "CF.{" . $CustomField->Name . "}";
+    $line{'Name'} = "'CF.{" . $CustomField->Name . "}'";
     $line{'Field'} = $CustomField->Name;
 
     # Op