[Rt-commit] r4006 - in rtir/branches/1.9-EXPERIMENTAL: . html/RTIR/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Mon Oct 31 10:52:17 2005
New Revision: 4006

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowChildren
Log:
 r223 at cubic-pc:  cubic | 2005-10-31 18:50:54 +0300
  r201 at cubic-pc:  cubic | 2005-10-27 10:53:24 +0400
  * @AddStates argument, that allow add additional states to show,
    for example 'rejected'.
  * fix ordering, all 'order by' things were ignored in code
 


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowChildren
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowChildren	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ShowChildren	Mon Oct 31 10:52:17 2005
@@ -30,15 +30,18 @@
    Collection => $MyTickets,
    Format => $Format,
    Rows => $Rows,
+   OrderBy => $OrderBy,
    ShowHeader => 0,
    ShowNavigation => 0,
 &>
 
 <& /Elements/TicketList, 
-   Collection => $ClosedTickets,
-   Format => $Format,
-   Rows => $Rows,
-   ShowHeader => 0,
+   Collection     => $ClosedTickets,
+   Format         => $Format,
+   Rows           => $Rows,
+   OrderBy        => 'Resolved',
+   Order          => 'DESC',
+   ShowHeader     => 0,
    ShowNavigation => 0,
 &>
 
@@ -57,33 +60,30 @@
 % }
 
 <%INIT>
-my ($Type, undef) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
+my ($Type, @states) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
 $Format = $RT::RTIRSearchResultFormats->{'Child' . $Type};
 
+my %seen = ();
+ at states = map lc, grep $_ && !$seen{$_}++, (@states, @AddStates);
+
 if ($Delete) {
     $Format = "___RTIR_Check__, " . $Format;
 }
 
-$Query = $m->comp('/RTIR/Elements/NewQuery', 
-             Queue => $Queue);
-
-$Query .= " AND MemberOf = " . $Ticket->Id;
-
 if (!$BaseQuery) {
     $BaseQuery = $m->comp('/RTIR/Elements/BaseQuery', Queue => $Queue);
 }
 
-$Query = "$BaseQuery AND ( $Query )";
-$OrderBy = 'Due';
+$Query  = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue, states => [@states] );
+$Query .= " AND MemberOf = " . $Ticket->Id;
+$Query  = "$BaseQuery AND ( $Query )";
+
 my $MyTickets = new RT::Tickets($session{'CurrentUser'});
 $MyTickets->FromSQL($Query);
 
-my $ClosedQuery = "MemberOf = " . $Ticket->Id;
-$ClosedQuery .= " AND Status = 'resolved'";
+my $ClosedQuery = "MemberOf = ". $Ticket->Id ." AND Status = 'resolved'";
+$ClosedQuery  = "$BaseQuery AND ( $ClosedQuery )";
 
-$ClosedQuery = "$BaseQuery AND ( $ClosedQuery )";
-my $ClosedOrderBy = 'Resolved';
-my $ClosedOrder = 'DESC';
 my $ClosedTickets = new RT::Tickets($session{'CurrentUser'});
 $ClosedTickets->FromSQL($ClosedQuery);
 
@@ -96,9 +96,10 @@
 $Format => undef
 $Queue => undef
 $Ticket => undef
-$OrderBy => undef
+$OrderBy => 'Due'
 $depth => 1
 $Rows => 0
 $Delete => 0
 $FullList => undef
+ at AddStates => ()
 </%ARGS>