[Rt-commit] [svn] r1401 - rtir/branches/1.1/html/RTIR/Elements

[leira at pallas.eruditorum.org]

Author: leira
Date: Thu Sep  2 17:27:51 2004
New Revision: 1401

Modified:
   rtir/branches/1.1/html/RTIR/Elements/QueueTabs
Log:
Fixed a bug in adding subtabs.


Modified: rtir/branches/1.1/html/RTIR/Elements/QueueTabs
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/QueueTabs	(original)
+++ rtir/branches/1.1/html/RTIR/Elements/QueueTabs	Thu Sep  2 17:27:51 2004
@@ -99,7 +99,6 @@
 		separator => 1};
     };
 
-
 # only show edit option if they can do it
 if ($Ticket->CurrentUserHasRight('ModifyTicket')) {
     $ticket_page_tabs->{'_E'} = { title => loc('Edit'),
@@ -115,7 +114,7 @@
 }
 
 foreach my $tab ( sort keys %{$ticket_page_tabs} ) {
-    if ( $ticket_page_tabs->{$tab}->{'path'} eq $current_tab ) {
+    if ( $ticket_page_tabs->{$tab}->{'path'} eq $current_subtab ) {
         $ticket_page_tabs->{$tab}->{"subtabs"}        = $subtabs;
         $tabs->{'this'}->{"current_subtab"}        = 
         $ticket_page_tabs->{$tab}->{"path"};
@@ -201,6 +200,13 @@
 }
 } else {
   $mytab = $current_tab;
+  foreach my $tab ( sort keys %{$tabs} ) {
+      if ( $tabs->{$tab}->{'path'} eq $current_tab ) {
+	  $tabs->{$tab}->{"subtabs"}        = $subtabs;
+	  $tabs->{'this'}->{"current_subtab"}        = 
+	      $tabs->{$tab}->{"path"};
+      }
+  }
 }
 
 $tabs->{"A"} = { path      => 'RTIR/Create.html?Queue=' . $QueueName,
@@ -233,13 +239,6 @@
 				  separator => 1 };
 }
 
-foreach my $tab ( sort keys %{$tabs} ) {
-    if ( $tabs->{$tab}->{'path'} eq $current_tab ) {
-        $tabs->{$tab}->{"subtabs"}        = $subtabs;
-        $tabs->{'this'}->{"current_subtab"}        = 
-        $tabs->{$tab}->{"path"};
-    }
-}
 </%INIT>