[Rt-commit] r2207 - in RT-View-Tree: . html/Callbacks/RT-Tree-View/Search/Results.html html/Search lib/RT/View

[jesse at bestpractical.com]

Author: jesse
Date: Thu Feb 10 13:55:55 2005
New Revision: 2207

Modified:
   RT-View-Tree/   (props changed)
   RT-View-Tree/html/Callbacks/RT-Tree-View/Search/Results.html/SearchActions
   RT-View-Tree/html/Search/Tree.html
   RT-View-Tree/lib/RT/View/Tree.pm
Log:
 r2294 at hualien (orig r292):  jesse | 2004-09-01T00:56:50.797060Z
  ----------------------------------------------------------------------
  r8470 at tinbook:  jesse | 2004-08-31T04:00:31.063071Z
  
  0.7 Mon Aug 30 23:59:23 EDT 2004
  
      -   Changed dependency ordering
      -   Started to honor search ordering
      -   Fixed misc. small bugs
  
  ----------------------------------------------------------------------
  r8481 at tinbook:  jesse | 2004-08-31T18:49:32.166133Z
  Added functionality to edit  ticket type for wolfram
  ----------------------------------------------------------------------
 


Modified: RT-View-Tree/html/Callbacks/RT-Tree-View/Search/Results.html/SearchActions
==============================================================================
--- RT-View-Tree/html/Callbacks/RT-Tree-View/Search/Results.html/SearchActions	(original)
+++ RT-View-Tree/html/Callbacks/RT-Tree-View/Search/Results.html/SearchActions	Thu Feb 10 13:55:55 2005
@@ -1,5 +1,5 @@
 <%args>
 $QueryString => undef
 </%args>
-<a href="<%$RT::WebPath%>/Search/Tree.html<%$QueryString%>"><&|/l&>Tree view</&></a> (<%$QueryString%>)
+<a href="<%$RT::WebPath%>/Search/Tree.html<%$QueryString%>"><&|/l&>Tree view</&></a>
 

Modified: RT-View-Tree/html/Search/Tree.html
==============================================================================
--- RT-View-Tree/html/Search/Tree.html	(original)
+++ RT-View-Tree/html/Search/Tree.html	Thu Feb 10 13:55:55 2005
@@ -27,7 +27,9 @@
     $m->comp( '.entry', Ticket => $ticket, Depth => 0, Format => \@Format,
     MaxDepth => $MaxDepth,
     HideChildren => $HideChildren,
-    HideDependencies => $HideDependencies
+    HideDependencies => $HideDependencies,
+    OrderBy => $OrderBy,
+    Order   => $Order
     );
 
 }
@@ -44,8 +46,8 @@
 value=<%$MaxDepth%>> 
 (<i><&|/l&>Leave this field blank to show everything</&></i>)
 </li>
-<li><input type="checkbox" name="HideChildren" <%$HideChildren%>><&|/l&>Hide subtasks</&></li>
-<li><input type="checkbox" name="HideDependencies" <%$HideDependencies%>><&|/l&>Hide dependencies</&></li>
+<li><input type="checkbox" name="HideChildren" <%$HideChildren&& 'CHECKED'%>><&|/l&>Hide subtasks</&></li>
+<li><input type="checkbox" name="HideDependencies" <%$HideDependencies && 'CHECKED'%>><&|/l&>Hide dependencies</&></li>
 </ul>
 <& /Elements/Submit &>
 <& /Elements/TitleBoxEnd &>
@@ -114,6 +116,7 @@
 my ($ticketcount);
 my $tickets = RT::Tickets->new( $session{'CurrentUser'} );
 $tickets->FromSQL($Query);
+$tickets->OrderBy( FIELD => $OrderBy , ORDER => $Order);
 my $top_tickets = ();
 my @tickets;
 @tickets = @{ $tickets->ItemsArrayRef || [] };
@@ -128,7 +131,7 @@
     my $deps = RT::Tickets->new( $session{'CurrentUser'} );
     my @query;
     unless ($HideDependencies) {
-        push @query, 'DependsOn = '.$ticket->id;
+        push @query, 'DependentOn = '.$ticket->id;
     }
     unless ($HideChildren) {
         push @query, 'MemberOf = '.$ticket->id;
@@ -153,8 +156,11 @@
 $MaxDepth => undef
 $HideChildren => undef
 $HideDependencies => undef
+$Order => undef
+$OrderBy => undef
 </%args>
-<& /Elements/CollectionAsTable/Row, Format => \@Format, i => $Depth, record => $Ticket&>
+<& /Elements/CollectionAsTable/Row, Format => \@Format, i => $Depth, record =>
+$Ticket&>
 <%perl>
 if ( !$MaxDepth ||  $Depth <= $MaxDepth ) {
 
@@ -164,12 +170,13 @@
         my $kids = RT::Tickets->new( $session{'CurrentUser'} );
         my @query;
         unless ($HideDependencies) {
-            push @query, 'DependsOn = ' . $Ticket->id;
+            push @query, 'DependentOn = ' . $Ticket->id;
         }
         unless ($HideChildren) {
             push @query, 'MemberOf = ' . $Ticket->id;
         }
         $kids->FromSQL( join( ' OR ', @query ) );
+        $kids->OrderBy( FIELD => $OrderBy , ORDER => $Order);
 
         while ( my $kid = $kids->Next ) {
 
@@ -182,6 +189,8 @@
                 MaxDepth         => $MaxDepth,
                 HideChildren     => $HideChildren,
                 HideDependencies => $HideDependencies,
+    OrderBy => $OrderBy,
+    Order   => $Order,
                 Format           => \@Format
             );
         }

Modified: RT-View-Tree/lib/RT/View/Tree.pm
==============================================================================
--- RT-View-Tree/lib/RT/View/Tree.pm	(original)
+++ RT-View-Tree/lib/RT/View/Tree.pm	Thu Feb 10 13:55:55 2005
@@ -1,6 +1,6 @@
 
 package RT::View::Tree;
 
-our $VERSION = '0.6';
+our $VERSION = '0.7';
 
 1;