[Rt-commit] r6553 - in rt/branches/3.6-RELEASE: . html/Elements

[jesse at bestpractical.com]

Author: jesse
Date: Fri Dec  1 13:49:44 2006
New Revision: 6553

Modified:
   rt/branches/3.6-RELEASE/   (props changed)
   rt/branches/3.6-RELEASE/html/Elements/ShowSearch
   rt/branches/3.6-RELEASE/html/Search/Chart.html

Log:
 r45276 at pinglin (orig r6486):  clkao | 2006-11-22 02:22:33 -0500
 Make the style of chart in myrt consistent.


Modified: rt/branches/3.6-RELEASE/html/Elements/ShowSearch
==============================================================================
--- rt/branches/3.6-RELEASE/html/Elements/ShowSearch	(original)
+++ rt/branches/3.6-RELEASE/html/Elements/ShowSearch	Fri Dec  1 13:49:44 2006
@@ -45,10 +45,10 @@
 %# END BPS TAGGED BLOCK }}}
 <&|/Widgets/TitleBox,
     title => loc($search->Description, $SearchArg->{'Rows'}),
-    title_href => "Search/Results.html".$QueryString,
+    title_href => $query_link_url.$QueryString,
     titleright => loc('Edit'),
     titleright_href => $customize &>
-<& /Elements/TicketList, %$SearchArg,
+<& $query_display_component, %$SearchArg,
         ShowNavigation => 0
         &>
 </&>
@@ -57,6 +57,8 @@
 my $user = $session{'CurrentUser'}->UserObj;
 my $SearchArg;
 my $customize;
+my $query_display_component = '/Elements/TicketList';
+my $query_link_url = 'Search/Results.html';
 
 if ($SavedSearch) {
     my ($container_object, $search_id ) = _parse_saved_search ($SavedSearch);
@@ -67,12 +69,14 @@
     }
     if ( $SearchArg->{SearchType} ne 'Ticket' ) {
         # XXX: dispatch to different handler here
-        $m->comp( '/Search/Elements/Chart', %$SearchArg );
-        return;
+        $query_display_component = '/Search/Elements/'.$SearchArg->{SearchType};
+        $query_link_url = 'Search/Chart.html';
+    }
+    else {
+	$customize = $RT::WebPath.'/Search/Build.html?'.
+	    $m->comp('/Elements/QueryString',
+		     LoadSavedSearch => $SavedSearch);
     }
-    $customize = $RT::WebPath.'/Search/Build.html?'.
-	$m->comp('/Elements/QueryString',
-		 LoadSavedSearch => $SavedSearch);
 }
 else {
     ($search) = RT::System->new($session{'CurrentUser'})->Attributes->Named('Search - '.$Name);

Modified: rt/branches/3.6-RELEASE/html/Search/Chart.html
==============================================================================
--- rt/branches/3.6-RELEASE/html/Search/Chart.html	(original)
+++ rt/branches/3.6-RELEASE/html/Search/Chart.html	Fri Dec  1 13:49:44 2006
@@ -79,7 +79,6 @@
 
         # Find out if we're saving on the user, or a group
         my $container_object = _load_container_object( $obj_type, $obj_id );
-        warn 'orz';
         my ( $search_id, $search_msg ) = $container_object->AddAttribute(
             Name        => 'SavedSearch',
             Description => $Description,