diff options
| author | ivan <ivan> | 2011-04-18 23:15:19 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-04-18 23:15:19 +0000 |
| commit | 75162bb14b3e38d66617077843f4dfdcaf09d5c4 (patch) | |
| tree | d89dd49a476cf2f0859ed6a0adc2992ea6d69d04 /rt/share/html/Search/Elements | |
| parent | fc6209f398899f0211cfcedeb81a3cd65e04a941 (diff) | |
import rt 3.8.10
Diffstat (limited to 'rt/share/html/Search/Elements')
| -rw-r--r-- | rt/share/html/Search/Elements/Chart | 2 | ||||
| -rw-r--r-- | rt/share/html/Search/Elements/SelectPersonType | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/rt/share/html/Search/Elements/Chart b/rt/share/html/Search/Elements/Chart index b74aba46d..e25a9efd0 100644 --- a/rt/share/html/Search/Elements/Chart +++ b/rt/share/html/Search/Elements/Chart @@ -56,6 +56,8 @@ use RT::Report::Tickets; $PrimaryGroupBy ||= 'Queue'; # make sure PrimaryGroupBy is not undef my $tix = RT::Report::Tickets->new( $session{'CurrentUser'} ); +my %AllowedGroupings = reverse $tix->Groupings( Query => $Query ); +$PrimaryGroupBy = 'Queue' unless exists $AllowedGroupings{$PrimaryGroupBy}; my ($count_name, $value_name) = $tix->SetupGroupings( Query => $Query, GroupBy => $PrimaryGroupBy, ); diff --git a/rt/share/html/Search/Elements/SelectPersonType b/rt/share/html/Search/Elements/SelectPersonType index 2d2097304..6454acff3 100644 --- a/rt/share/html/Search/Elements/SelectPersonType +++ b/rt/share/html/Search/Elements/SelectPersonType @@ -72,7 +72,7 @@ else { @types = qw(Requestor Cc AdminCc Watcher Owner QueueCc QueueAdminCc QueueWatcher); } -my @subtypes = qw(EmailAddress Name RealName Nickname Organization Address1 Address2 WorkPhone HomePhone MobilePhone PagerPhone id); +my @subtypes = @{ $RT::Tickets::SEARCHABLE_SUBFIELDS{'User'} }; </%INIT> <%ARGS> |