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

[glasser at bestpractical.com]

Author: glasser
Date: Wed Mar 29 15:40:04 2006
New Revision: 4872

Modified:
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html

Log:
Add reject/quick reject commands to IRs which you can own even if you don't
own them; requires RT as of r4870.


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html	Wed Mar 29 15:40:04 2006
@@ -243,6 +243,11 @@
         push @results, $msg;
     }
 
+    if ( $ARGS{'TakeOrStealFirst'} ) {
+        my ($status, $msg) = $Ticket->TakeOrSteal;
+	push @results, $msg if $msg;
+    }
+
     $ARGS{UpdateAttachments} = delete $session{'Attachments'};
     push @results, ProcessUpdateMessage( TicketObj => $Ticket, ARGSRef => \%ARGS );
     push @results, ProcessTicketBasics(  TicketObj => $Ticket, ARGSRef => \%ARGS );

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	Wed Mar 29 15:40:04 2006
@@ -189,17 +189,7 @@
                     title => loc('Quick Resolve'),
                 };
             }
-            if ( $Type eq 'Report' ) {
-                $actions->{'B'} = {
-                    path =>
-                        "RTIR/Update.html?Action=Comment&DefaultStatus=rejected&id=$id",
-                    title => loc('Reject'),
-                };
-                $actions->{'Bb'} = {
-                    path  => "RTIR/Display.html?Status=rejected&id=$id",
-                    title => loc('Quick Reject'),
-                };
-            } elsif ( $Type eq 'Incident' ) {
+	    if ( $Type eq 'Incident' ) {
                 $actions->{'B'} = {
                     path =>
                         "RTIR/Incident/Reply.html?id=$id&Action=Comment&All=1&DefaultStatus=rejected&SelectAllTickets=1",
@@ -226,6 +216,20 @@
                 title => loc('Steal')
             };
         }
+    }	
+
+    if ( $can{'ModifyTicket'} || $can{'OwnTicket'} ) {
+	if ( $Type eq 'Report' ) {
+	  $actions->{'B'} = {
+			     path => "RTIR/Update.html?Action=Comment&TakeOrStealFirst=1&DefaultStatus=rejected&id=$id",
+			     title => loc('Reject'),
+			    };
+
+	  $actions->{'Bb'} = {
+			      path  => "RTIR/Display.html?Status=rejected&TakeOrStealFirst=1&id=$id",
+			      title => loc('Quick Reject'),
+			     };
+	}
     }
 
     if ( $can{'ModifyTicket'} || $can{'CommentOnTicket'} ) {

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html	Wed Mar 29 15:40:04 2006
@@ -34,6 +34,7 @@
 <input type="hidden" name="DefaultStatus" value="<% $ARGS{DefaultStatus} %>" />
 <input type="hidden" name="Status" value="<% $ARGS{DefaultStatus} %>" />
 <input type="hidden" name="Action" value="<% $ARGS{Action} %>" />
+<input type="hidden" name="TakeOrStealFirst" value="<% $ARGS{TakeOrStealFirst} %>" />
 % if ($Type eq 'Report' and $ARGS{'DefaultStatus'} eq 'rejected') {
 %   my $query = "Queue = 'Incidents' AND HasMember = " . $Ticket->Id;
 %   my $incidents = new RT::Tickets($session{'CurrentUser'});