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

[ruz at bestpractical.com]

Author: ruz
Date: Tue Apr 11 18:10:19 2006
New Revision: 5019

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

Log:
 r1287 at cubic-pc:  cubic | 2006-04-12 01:44:00 +0400
 * allow to [quick] remove Block with action
 * rename 'open' action to 'activate' for Blocks


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 18:10:19 2006
@@ -194,6 +194,15 @@
                     path  => "RTIR/Display.html?Status=resolved&id=$id",
                     title => loc('Quick Resolve'),
                 };
+            } elsif ( $Type eq 'Block' ) {
+                $actions->{'Ac'} = {
+                    path  => "RTIR/Update.html?Action=Comment&DefaultStatus=resolved&id=$id",
+                    title => loc('Remove'),
+                };
+                $actions->{'Acc'} = {
+                    path  => "RTIR/Display.html?Status=resolved&id=$id",
+                    title => loc('Quick Remove'),
+                };
             }
             if ( $Type eq 'Incident' ) {
                 $actions->{'B'} = {
@@ -203,10 +212,17 @@
                 };
             }
         } else {
-            $actions->{'C'} = {
-                path  => "RTIR/Display.html?Status=open&id=$id",
-                title => loc('Open')
-            };
+            if ( $Type eq 'Block' ) {
+                $actions->{'C'} = {
+                    path  => "RTIR/Display.html?Status=open&id=$id",
+                    title => loc('Activate')
+                };
+            } else {
+                $actions->{'C'} = {
+                    path  => "RTIR/Display.html?Status=open&id=$id",
+                    title => loc('Open')
+                };
+            }
         }
     }
 
@@ -280,8 +296,7 @@
     };
 } 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 );
+        my ($childtype) = $m->comp( '/RTIR/Elements/Type', TicketObj => $Ticket );
 
         $tabs->{'h'} = {
             title => loc( 'Link [_1] #[_2]', $childtype, $Ticket->Id ),