import rt 3.4.4

1 files changed, 42 insertions, 33 deletions

diff --git a/rt/html/Admin/Elements/UserTabs b/rt/html/Admin/Elements/UserTabs
index 671bd6dd4..0ffd29b0f 100644
--- a/rt/html/Admin/Elements/UserTabs
+++ b/rt/html/Admin/Elements/UserTabs
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,52 +42,61 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
-<& /Admin/Elements/Tabs,
+%# END BPS TAGGED BLOCK }}}
+<& /Admin/Elements/Tabs, 
     subtabs => $tabs,
-    current_tab => 'Admin/Users/',
-    current_subtab => $current_tab,
+    current_tab => 'Admin/Users/', 
+    current_subtab => $current_tab, 
     Title => $Title &>
 <%INIT>
 my $tabs;
 if ($id) {
-	$tabs->{'this'} = {
-		title => eval { $UserObj->Name },
+$tabs->{'this'} = { title => eval { $UserObj->Name },
+
 		path => "Admin/Users/Modify.html?id=".$id,
-		current_subtab => $current_tab,
-		subtabs => {
-			A => { title => loc('Basics'),
+subtabs => {
+	       Basics => { title => loc('Basics'),
 				path => "Admin/Users/Modify.html?id=".$id
 			},
-		}
+	       Memberships => { title => loc('Memberships'),
+			   path => "Admin/Users/Memberships.html?id=".$id
+			 },
+	       History => { title => loc('History'),
+			   path => "Admin/Users/History.html?id=".$id
+			 },
+#	       Scrips => { title => loc('Rights'),
+#			   path => "Admin/Users/Rights.html?id=".$id
+#			 }
+	       
 	}
 }
-
-if ( $session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers') ) {
-	$tabs->{"A"} = {
-		title => loc('Select user'),
-		path => "Admin/Users/",
-	};
-	$tabs->{"B"} = {
-		title => loc('New user'),
-		path => "Admin/Users/Modify.html?Create=1",
+}
+if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers')) {
+  $tabs->{"A"} = { title => loc('Select user'),
+  		     	path => "Admin/Users/",
+			   };
+  $tabs->{"B"} = { title => loc('New user'),
+  		     	path => "Admin/Users/Modify.html?Create=1",
 		separator => 1,
 	};
 }
 
-# Now let callbacks add their extra tabs
-$m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
-
-foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {
-	if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
-		$tabs->{'this'}->{"current_subtab"} = $current_tab; 
-		$tabs->{'this'}->{'subtabs'}->{$tab}->{"current_subtab"} = $current_subtab; 
-		$tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"} = $subtabs; 
-	}
-}
-
+  # Now let callbacks add their extra tabs
+  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+                                                                                
+#foreach my $tab ( sort keys %{$tabs} ) {                                        
+#    if ( $tabs->{$tab}->{'path'} eq $current_subtab ) {                         
+#        $tabs->{$tab}->{"current_subtab"} = $current_subtab;                    
+#    }                                                                           
+#}                                                                               
+foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {  
+    if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
+        $tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"}        = $subtabs; 
+        $tabs->{'this'}->{'subtabs'}->{$tab}->{"current_subtab"} = $current_subtab; 
+    }                                                                           
+}   
+$tabs->{'this'}->{"current_subtab"} = $current_tab; 
 $current_tab = "Admin/Users/Modify.html?id=".$id if $id;
-
 </%INIT>
 <%ARGS>
 $UserObj => undef