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

[jesse at bestpractical.com]

Author: jesse
Date: Fri Dec  1 13:51:59 2006
New Revision: 6559

Modified:
   rt/branches/3.6-RELEASE/   (props changed)
   rt/branches/3.6-RELEASE/html/Prefs/MyRT.html
   rt/branches/3.6-RELEASE/html/Search/Elements/EditSearches
   rt/branches/3.6-RELEASE/lib/RT/Interface/Web.pm

Log:
 r45283 at pinglin (orig r6493):  clkao | 2006-11-22 04:56:50 -0500
 Fix chart saved in rt::system for selection in MyRT preferences.
 


Modified: rt/branches/3.6-RELEASE/html/Prefs/MyRT.html
==============================================================================
--- rt/branches/3.6-RELEASE/html/Prefs/MyRT.html	(original)
+++ rt/branches/3.6-RELEASE/html/Prefs/MyRT.html	Fri Dec  1 13:51:59 2006
@@ -65,7 +65,6 @@
 </form>
 </&>
 <%INIT>
-use RT::SavedSearches;
 my @actions;
 
 my $title = loc("Customize").' '.loc("RT at a glance");
@@ -105,7 +104,8 @@
 for my $object (@objs) {
     for ($m->comp("/Search/Elements/SearchesForObject", Object => $object)) {
 	my ($desc, $search) = @$_;
-	if ($object eq $sys) {
+	my $SearchType = $search->Content->{'SearchType'} || 'Ticket';
+	if ($object eq $sys && $SearchType eq 'Ticket') {
 	    push @items, ["system-$desc", $desc];
 	    push @sys_searches, [$desc, $search];
 	}

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:51:59 2006
@@ -74,7 +74,6 @@
 </&>
 
 <%init>
-use RT::SavedSearches;
 unless ($session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch',
                                            Object=> $RT::System )) {
     return;

Modified: rt/branches/3.6-RELEASE/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.6-RELEASE/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/3.6-RELEASE/lib/RT/Interface/Web.pm	Fri Dec  1 13:51:59 2006
@@ -67,6 +67,7 @@
 
 package RT::Interface::Web;
 use HTTP::Date;
+use RT::SavedSearches;
 use URI;
 
 # {{{ EscapeUTF8
@@ -1621,7 +1622,7 @@
 
 sub _load_container_object {
     my ($obj_type, $obj_id) = @_;
-    return RT::SavedSearch->new($self->CurrentUser)->_load_privacy_object($obj_type, $obj_id);
+    return RT::SavedSearch->new($session{'CurrentUser'})->_load_privacy_object($obj_type, $obj_id);
 }
 
 =head2 _parse_saved_search ( $arg );