[Rt-commit] r5007 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Tue Apr 11 05:04:31 2006
New Revision: 5007

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs

Log:
 r1274 at cubic-pc:  cubic | 2006-04-11 04:25:08 +0400
 * don't change status/state of the block when reply
 * minor cleanups


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 Apr 11 05:04:31 2006
@@ -42,6 +42,7 @@
     $Ticket = RT::Ticket->new( $session{'CurrentUser'} );
     $Ticket->Load( $id );
 }
+$id = $Ticket->id if $Ticket;
 
 my ($Type) = $m->comp( '/RTIR/Elements/Type', Queue => $QueueName );
 
@@ -55,7 +56,6 @@
 my $searchtabs = {};
 
 if ( $Ticket && $Ticket->QueueObj->Name eq $QueueName ) {
-    my $id = $Ticket->id;
     $mytab = "RTIR/Display.html?id=$id";
 
     if ( $session{'tickets'} ) {
@@ -135,12 +135,12 @@
             }
         }
     }
-    $current_subtab ||= "RTIR/Display.html?id=$id";
 
+    $current_subtab ||= "RTIR/Display.html?id=$id";
     $tabs->{'this'}->{'subtabs'} = $ticket_page_tabs;
     foreach my $tab ( values %$ticket_page_tabs ) {
         next unless $tab->{'path'} eq $current_subtab;
-        
+
         $tab->{'subtabs'} = { %{ $tab->{'subtabs'} || {} }, %$subtabs } if $subtabs;
         $tabs->{'this'}->{'current_subtab'} = $tab->{'path'};
     }
@@ -159,11 +159,17 @@
                 path  =>
                     "RTIR/Incident/Reply.html?id=$id&DefaultStatus=stalled&SelectAllTickets=1&All=1",
             };
+        } elsif ( $Type eq 'Block' ) {
+            $actions->{'A'} = {
+                title => loc('Reply'),
+                path  =>
+                    "RTIR/Update.html?id=$id&Action=Respond",
+            };
         } else {
             $actions->{'A'} = {
                 title => loc('Reply'),
                 path  =>
-                    "RTIR/Update.html?Action=Respond&DefaultStatus=stalled&id=$id",
+                    "RTIR/Update.html?id=$id&Action=Respond&DefaultStatus=stalled",
             };
         }
     }
@@ -244,9 +250,6 @@
     $mytab = $current_tab;
 }
 
-my $refinetabs = {};
-
-# If we're looking at a specific item, dont' show the refine tab
 $tabs->{"A"} = {
     path  => "RTIR/Create.html?$EscapedQueueName",
     title => loc("New $Type"),
@@ -256,7 +259,7 @@
     path      => "RTIR/Search/Results.html?$EscapedQueueName&$QueryString",
     title     => loc('Results'),
 };
-unless ( $Ticket and $Ticket->id ) {
+unless ( $id ) {
     $tabs->{'ga'} = {
         class => "nav",
         path  => "RTIR/Search/Refine.html?$EscapedQueueName&$QueryString&"