[Rt-commit] r4108 - in rtir/branches/1.9-EXPERIMENTAL: . html/RTIR/Elements html/RTIR/Incident

[ruz at bestpractical.com]

Author: ruz
Date: Tue Nov 15 23:43:49 2005
New Revision: 4108

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
Log:
 r284 at cubic-pc:  cubic | 2005-11-16 07:46:08 +0300
  r275 at cubic-pc:  cubic | 2005-11-16 07:03:10 +0300
  * bulk abandon tabs
 


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs	Tue Nov 15 23:43:49 2005
@@ -215,21 +215,24 @@
     $tabs->{"h"} = { path      => 'RTIR/Report/BulkReject.html',
                      title     => loc('Bulk Reject'),
                      separator => 1 };
-
-    if ( $tabs->{'h'}->{'path'} eq $current_tab ) {
-        $tabs->{'h'}->{'subtabs'} = $subtabs;
-    }
 }
-elsif ( $Type eq 'Incident' && $Ticket && $Ticket->QueueObj->Name ne 'Incidents') {
-    my $childq = $Ticket->QueueObj->Name;
-    my ($childtype) = $m->comp('/RTIR/Elements/Type', Queue => $childq);
-    
-    $tabs->{'h'} = { title     => loc( 'Link [_1] #[_2]', $childtype, $Ticket->Id ),
-                     path      => "RTIR/Incident/LinkToIncident.html?id=". $Ticket->Id,
+elsif ( $Type eq 'Incident' ) {
+    if( $Ticket && $Ticket->QueueObj->Name ne 'Incidents') {
+        my $childq = $Ticket->QueueObj->Name;
+        my ($childtype) = $m->comp( '/RTIR/Elements/Type', Queue => $childq );
+        
+        $tabs->{'h'} = { title     => loc( 'Link [_1] #[_2]', $childtype, $Ticket->Id ),
+                         path      => "RTIR/Incident/LinkToIncident.html?id=". $Ticket->Id,
+                         separator => 1 };
+    }
+    $tabs->{'k'} = { path      => 'RTIR/Incident/BulkAbandon.html',
+                     title     => loc('Bulk Abandon'),
                      separator => 1 };
+}
 
-    if ( $tabs->{'h'}->{'path'} eq $current_tab ) {
-        $tabs->{'h'}->{'subtabs'} = $subtabs;
+foreach ( keys %{$tabs} ) {
+    if ( $tabs->{ $_ }->{'path'} eq $current_tab ) {
+        $tabs->{ $_ }->{'subtabs'} = $subtabs;
     }
 }
 

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html	Tue Nov 15 23:43:49 2005
@@ -193,7 +193,7 @@
 $OrderBy => 'id'
 $Order => 'ASC'
 $BaseURL => $RT::WebPath . "/RTIR/Report/BulkAbandon.html"
-$current_tab => 'RTIR/Report/BulkAbandon.html'
+$current_tab => 'RTIR/Incident/BulkAbandon.html'
 @SelectedTickets => ()
 @ReplyToAll => ()
 </%ARGS>