From 2727a5a28a05f7c6c9480563670da29fc0b0bc8b Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 21 Jul 2010 02:10:33 +0000 Subject: [PATCH] fix problems searching the new custom fields w/dates, RT#8449 --- rt/FREESIDE_MODIFIED | 2 +- rt/share/html/Search/Build.html | 2 +- rt/share/html/Search/Elements/PickCFs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index 0e34a979e..31a930367 100644 --- 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 f347acd79..c5067d5d1 100644 --- 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 3f6d188b8..beda9f733 100644 --- 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 -- 2.11.0