X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FUsers%2FMyRT.html;h=1836b43df646a2e211dbf59e6f89180dfc4816ba;hb=b8988e1d3ac75af63c85e8563e57701030315a9e;hp=346a2d60ca79216f15c05f051ffeab71ef2d8c55;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941;p=freeside.git diff --git a/rt/share/html/Admin/Users/MyRT.html b/rt/share/html/Admin/Users/MyRT.html index 346a2d60c..1836b43df 100644 --- 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-2014 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -46,11 +46,7 @@ %# %# END BPS TAGGED BLOCK }}} <& /Admin/Elements/Header, Title => $title &> -<& /Admin/Elements/UserTabs, - id => $id, - UserObj => $UserObj, - current_tab => $current_tab, - Title => $title &> +<& /Elements/Tabs &> <& /Widgets/SelectionBox:header, nojs => 1 &> @@ -72,9 +68,7 @@ <%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,25 +83,25 @@ 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"]; + push @items, ["saved-$oid", loc($type).": $loc_desc"]; } } }