[Rt-commit] [svn] r1090 - in rt/trunk/html/Admin: Elements Users

[huberth at pallas.eruditorum.org]

Author: huberth
Date: Wed Jun 16 18:14:59 2004
New Revision: 1090

Modified:
   rt/trunk/html/Admin/Elements/UserTabs
   rt/trunk/html/Admin/Users/Modify.html
Log:
RT-Ticket: 5697
RT-Status: resolved

subject: Admin/UserTabs cleanup
Patch supplied and applied to 3.0.  Modified html/Admin/Elements/UserTabs.

Modified: rt/trunk/html/Admin/Elements/UserTabs
==============================================================================
--- rt/trunk/html/Admin/Elements/UserTabs	(original)
+++ rt/trunk/html/Admin/Elements/UserTabs	Wed Jun 16 18:14:59 2004
@@ -21,54 +21,60 @@
 %# 
 %# 
 %# END LICENSE BLOCK
-<& /Admin/Elements/Tabs, 
+<& /Admin/Elements/Tabs,
     subtabs => $tabs,
-    current_tab => 'Admin/Users/', 
-    current_subtab => $current_subtab, 
+    current_tab => 'Admin/Users/',
+    current_subtab => $current_tab,
     Title => $Title &>
 <%INIT>
 my $tabs;
-my $subtabs;
 if ($id) {
-$tabs->{'this'} = { title => eval { $UserObj->Name },
-
-			   path => "Admin/Users/Modify.html?id=".$id,
-subtabs => {
-	       Queues => { title => loc('Basics'),
-			   path => "Admin/Users/Modify.html?id=".$id
-			 },
-#	       Scrips => { title => loc('Rights'),
-#			   path => "Admin/Users/Rights.html?id=".$id
-#			 }
-	       
-	      }
+	$tabs->{'this'} = {
+		title => eval { $UserObj->Name },
+		path => "Admin/Users/Modify.html?id=".$id,
+		current_subtab => $current_tab,
+		subtabs => {
+			A => { title => loc('Basics'),
+				path => "Admin/Users/Modify.html?id=".$id
+			},
+			D => { title => loc('MemberOf'),
+				path => "Admin/Users/MemberOf.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",
+		separator => 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;                    
-    }                                                                           
-}                                                                               
+$current_tab = "Admin/Users/Modify.html?id=".$id if $id;
+
 </%INIT>
-  
-  
 <%ARGS>
 $UserObj => undef
 $id => undef
 $current_tab => undef
+$subtabs => undef
 $current_subtab => undef
 $Title => undef
 </%ARGS>

Modified: rt/trunk/html/Admin/Users/Modify.html
==============================================================================
--- rt/trunk/html/Admin/Users/Modify.html	(original)
+++ rt/trunk/html/Admin/Users/Modify.html	Wed Jun 16 18:14:59 2004
@@ -25,7 +25,7 @@
 <& /Admin/Elements/UserTabs, 
     id => $id, 
     UserObj => $UserObj,
-    current_subtab => $current_tab, 
+    current_tab => $current_tab, 
     Title => $title &>
 
 <& /Elements/ListActions, actions => \@results &>
@@ -243,8 +243,6 @@
 	$Create = 1;
     }    
 
-    
-
 }