rt 4.2.13 ticket#13852

[freeside.git] / rt / share / html / Admin / Users / MyRT.html

diff --git a/rt/share/html/Admin/Users/MyRT.html b/rt/share/html/Admin/Users/MyRT.html
index 346a2d6..0bd2473 100644 (file)
--- a/rt/share/html/Admin/Users/MyRT.html
+++ b/rt/share/html/Admin/Users/MyRT.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,13 +46,7 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => $title  &>
-<& /Admin/Elements/UserTabs, 
-    id => $id, 
-    UserObj => $UserObj,
-    current_tab => $current_tab, 
-    Title => $title &>
-
-<& /Widgets/SelectionBox:header, nojs => 1 &>
+<& /Elements/Tabs &>
 
 <& /Elements/ListActions, actions => \@actions &>
 
@@ -66,15 +60,13 @@
 
 % for my $pane (@panes) {
 <&|/Widgets/TitleBox, title => loc('RT at a glance').': '.loc($pane->{Name}), bodyclass => "" &>
-<& /Widgets/SelectionBox:show, self => $pane, nojs => 1 &></&>
+<& /Widgets/SelectionBox:show, self => $pane &></&>
 <br />
 % }
 
 <%init>
 my @actions;
-my $current_tab;
-$current_tab = 'Admin/Users/MyRT.html?id='.$id if $id;
-my $UserObj = new RT::User($session{'CurrentUser'});
+my $UserObj = RT::User->new($session{'CurrentUser'});
 $UserObj->Load($id) || Abort("Couldn't load user '" . ($id || '') . "'");
 my $title = loc("RT at a glance for the user [_1]", $UserObj->Name);
 
@@ -89,32 +81,33 @@ my $portlets  = $UserObj->Preferences('HomepageSettings', $default_portlets ? $d
 my %allowed_components = map {$_ => 1} @{ RT->Config->Get('HomepageComponents') };
 
 my @items;
-push @items, map {["component-$_", $_]} sort keys %allowed_components;
+push @items, map {["component-$_", loc($_)]} sort keys %allowed_components;
 
 my $sys = RT::System->new( RT::CurrentUser->new($UserObj) );
 my @objs = ($sys);
 
-push @objs, RT::SavedSearches->new( RT::CurrentUser->new( $UserObj ) )->_PrivacyObjects;
+push @objs, RT::SavedSearch->new( RT::CurrentUser->new( $UserObj ) )->ObjectsForLoading;
 
 for my $object (@objs) {
     for ($m->comp("/Search/Elements/SearchesForObject", Object => $object)) {
-        my ($desc, $search) = @$_;
+        my ($desc, $loc_desc, $search) = @$_;
         my $SearchType = $search->Content->{'SearchType'} || 'Ticket';
         if ($object eq $sys && $SearchType eq 'Ticket') {
-            push @items, ["system-$desc", $desc];
+            push @items, ["system-$desc", $loc_desc];
         }
         else {
             my $oid = ref($object).'-'.$object->Id.'-SavedSearch-'.$search->Id;
             my $type = ($SearchType eq 'Ticket')
-                ? 'Saved Search' : $SearchType; # loc
-            push @items, ["saved-$oid", loc($type).": $desc"];
+                ? 'Saved Search' # loc
+                : $SearchType;
+            push @items, ["saved-$oid", loc($type).": $loc_desc"];
         }
     }
 }
 
 my @panes = $m->comp(
     '/Admin/Elements/ConfigureMyRT',
-    panes  => ['body', 'summary'],
+    panes  => ['body', 'sidebar'],
     Action => "MyRT.html?id=$id",
     items => \@items,
     current_portlets => $portlets,
@@ -125,7 +118,7 @@ my @panes = $m->comp(
     }
 );
 
-$m->comp( '/Widgets/SelectionBox:process', %ARGS, self => $_, nojs => 1 )
+$m->comp( '/Widgets/SelectionBox:process', %ARGS, self => $_ )
     for @panes;
 
 </%init>