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

[jesse at bestpractical.com]

Author: jesse
Date: Fri Dec  1 13:56:55 2006
New Revision: 6569

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

Log:
 r45294 at pinglin (orig r6504):  clkao | 2006-11-22 14:23:23 -0500
 simple saved chart ui.


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:56:55 2006
@@ -58,6 +58,33 @@
 push @Objects, RT::System->new($session{'CurrentUser'})
     if $session{'CurrentUser'}->HasRight( Object=> $RT::System,
                                           Right => 'SuperUser');
+# look for the current one in the available saved searches
+my $SearchParams = {
+    Query            => $Query,
+    PrimaryGroupBy   => $PrimaryGroupBy,
+    SecondaryGroupBy => $SecondaryGroupBy || '',
+    ChartStyle       => $ChartStyle
+};
+
+my $CurrentSearch;
+my $SearchId = 'new';
+for my $obj (@Objects) {
+    for ( $m->comp( "/Search/Elements/SearchesForObject", Object => $obj ) ) {
+        my ( $desc, $search ) = @$_;
+        use Data::Dumper;
+	# FFS
+        $Data::Dumper::Sortkeys = 1;
+        if ( Dumper( $search->Content ) eq
+            Dumper( { %$SearchParams, SearchType => 'Chart' } ) )
+        {
+            $CurrentSearch->{Object}      = $search;
+            $CurrentSearch->{Description} = $search->Description;
+            $SearchId                     = $search->Id;
+            warn "got... $SearchId";
+        }
+    }
+}
+
 my @actions;
 if ( $ARGS{Save} ) {
     my $saved_search = RT::SavedSearch->new( $session{'CurrentUser'} );
@@ -65,12 +92,7 @@
         Privacy      => $ARGS{'Owner'},
         Name         => $Description,
         Type         => 'Chart',
-        SearchParams => {
-            Query            => $Query,
-            PrimaryGroupBy   => $PrimaryGroupBy,
-            SecondaryGroupBy => $SecondaryGroupBy,
-            ChartStyle       => $ChartStyle
-        });
+        SearchParams => $SearchParams );
     if ($ok) {
 	push @actions, loc( 'Chart [_1] saved.', $Description );
     }
@@ -87,10 +109,8 @@
 
 <form method="post" action="Chart.html" name="SaveChart">
 
-<& Elements/SelectSearchObject, Name => 'Owner', Objects => \@Objects &><br />
-
-<&|/l&>Description</&>:<br>
-<font size="-1"><input size="25" name="Description" value="" /></font>
+<& Elements/EditSearches, Name => 'Owner', SearchType => 'Chart',
+   CurrentSearch => $CurrentSearch, SearchId => $SearchId &><br />
 <input type="hidden" class="hidden" name="Query" value="<%$Query%>" />
 <input type="hidden" class="hidden" name="PrimaryGroupBy" value="<%$PrimaryGroupBy%>" />
 <input type="hidden" class="hidden" name="SecondaryGroupBy" value="<%$SecondaryGroupBy%>" />

Modified: rt/branches/3.6-RELEASE/html/Search/Elements/EditSearches
==============================================================================
--- rt/branches/3.6-RELEASE/html/Search/Elements/EditSearches	(original)
+++ rt/branches/3.6-RELEASE/html/Search/Elements/EditSearches	Fri Dec  1 13:56:55 2006
@@ -69,7 +69,7 @@
 <hr />
 % }
 <&|/l&>Load saved search:</&><br />
-<& SelectSearchesForObjects, Name => 'LoadSavedSearch', Objects => \@Objects&>
+<& SelectSearchesForObjects, Name => 'LoadSavedSearch', Objects => \@Objects, SearchType => $SearchType &>
 <input value="<%loc('Load')%>" type="submit" class="button" />
 </&>
 
@@ -87,6 +87,7 @@
 </%INIT>
 
 <%ARGS>
+$SearchType => 'Ticket'
 $SearchId => undef
 $CurrentSearch => undef
 $Description => undef

Modified: rt/branches/3.6-RELEASE/html/Search/Elements/SelectSearchesForObjects
==============================================================================
--- rt/branches/3.6-RELEASE/html/Search/Elements/SelectSearchesForObjects	(original)
+++ rt/branches/3.6-RELEASE/html/Search/Elements/SelectSearchesForObjects	Fri Dec  1 13:56:55 2006
@@ -46,6 +46,7 @@
 <%args>
 @Objects => undef
 $Name => undef
+$SearchType => 'Ticket',
 </%args>
 <select name="<%$Name%>">
 % foreach my $object (@Objects) {
@@ -57,9 +58,9 @@
 % }
 % my @searches = $object->Attributes->Named('SavedSearch');
 % foreach my $search (@searches) { 
-%     # Skip it if it is not a ticket search.
+%     # Skip it if it is not of search type we want.
 %     next if ($search->SubValue('SearchType')
-%              && $search->SubValue('SearchType') ne 'Ticket');
+%              && $search->SubValue('SearchType') ne $SearchType);
 <option value="<%ref($object)%>-<%$object->id%>-SavedSearch-<%$search->Id%>"> -<%$search->Description||loc('Unnamed search')%></option>
 % }
 % }