import rt 3.0.12

[freeside.git] / rt / html / Admin / Elements / UserTabs

diff --git a/rt/html/Admin/Elements/UserTabs b/rt/html/Admin/Elements/UserTabs
index 764fdfc..8d8f769 100644 (file)
--- a/rt/html/Admin/Elements/UserTabs
+++ b/rt/html/Admin/Elements/UserTabs
@@ -21,54 +21,57 @@
 %# 
 %# 
 %# 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
+                       },
+               }
+       }
 }
+
+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>