diff options
| author | mark <mark> | 2012-02-19 00:34:44 +0000 |
|---|---|---|
| committer | mark <mark> | 2012-02-19 00:34:44 +0000 |
| commit | e010976ba33c00bb2b97d677f610e4b19571feaf (patch) | |
| tree | 38df4dd0e9f525829fb7373b7783442a9d8170a1 /rt/share/html/Search | |
| parent | e67988848e92af19719fe7c06c589e3b7b46d058 (diff) | |
improve customer field access in RT queries, #16490
Diffstat (limited to 'rt/share/html/Search')
| -rw-r--r-- | rt/share/html/Search/Build.html | 2 | ||||
| -rw-r--r-- | rt/share/html/Search/Elements/BuildFormatString | 12 | ||||
| -rw-r--r-- | rt/share/html/Search/Elements/ConditionRow | 3 | ||||
| -rw-r--r-- | rt/share/html/Search/Elements/PickBasics | 3 |
4 files changed, 14 insertions, 6 deletions
diff --git a/rt/share/html/Search/Build.html b/rt/share/html/Search/Build.html index 9507a2dbb..506384c4b 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/BuildFormatString b/rt/share/html/Search/Elements/BuildFormatString index f77c8da84..96e6a2863 100644 --- a/rt/share/html/Search/Elements/BuildFormatString +++ b/rt/share/html/Search/Elements/BuildFormatString @@ -69,11 +69,15 @@ $CurrentDisplayColumns => undef # it -- and it grows per request. # All the things we can display in the format string by default -my @fields = qw( +# referenced by their ColumnMap keys +my @fields = ( + qw( id QueueName Subject + ), + + $m->comp('/Elements/CustomerFields', 'Names'), #freeside - Customer Agent CustomerClass CustomerTags AdvertisingSource - + qw( Status ExtendedStatus UpdateStatus Type @@ -99,7 +103,7 @@ my @fields = qw( Bookmark NEWLINE - + ) ); # loc_qw $m->callback( CallbackOnce => 1, CallbackName => 'SetFieldsOnce', Fields => \@fields ); diff --git a/rt/share/html/Search/Elements/ConditionRow b/rt/share/html/Search/Elements/ConditionRow index fe21f4d66..65e217639 100644 --- a/rt/share/html/Search/Elements/ConditionRow +++ b/rt/share/html/Search/Elements/ConditionRow @@ -82,7 +82,8 @@ $handle_block = sub { my $res = ''; $res .= qq{<select id="$name" name="$name">}; my @options = @{ $box->{'Options'} }; - while( my $k = shift @options ) { + while( @options ) { + my $k = shift @options; my $v = shift @options; $res .= qq{<option value="$k">$v</option>}; } diff --git a/rt/share/html/Search/Elements/PickBasics b/rt/share/html/Search/Elements/PickBasics index b03fc15d5..ff30f7c11 100644 --- a/rt/share/html/Search/Elements/PickBasics +++ b/rt/share/html/Search/Elements/PickBasics @@ -209,6 +209,9 @@ my @lines = ( }, ); +#freeside +push @lines, $m->comp('/Elements/CustomerFields', 'PickBasics'); + $m->callback( Conditions => \@lines ); </%INIT> |