[Rt-commit] r6200 - in rt/branches/3.6-RELEASE: .

[ruz at bestpractical.com]

Author: ruz
Date: Thu Oct 12 22:33:13 2006
New Revision: 6200

Modified:
   rt/branches/3.6-RELEASE/   (props changed)
   rt/branches/3.6-RELEASE/html/Ticket/Elements/Tabs

Log:
 r3950 at cubic-pc:  cubic | 2006-10-13 06:07:28 +0400
 * fine tune [Take] and [Steal] actions according to ACL


Modified: rt/branches/3.6-RELEASE/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/3.6-RELEASE/html/Ticket/Elements/Tabs	(original)
+++ rt/branches/3.6-RELEASE/html/Ticket/Elements/Tabs	Thu Oct 12 22:33:13 2006
@@ -162,13 +162,21 @@
 }
 
 if ( $Ticket->CurrentUserHasRight('OwnTicket') ) {
-    if ( $Ticket->OwnerObj->id == $RT::Nobody->id ) {
-        $actions->{'B'} = { path => "Ticket/Display.html?Action=Take&id=" . $id,
-                            title => loc('Take') };
+    if ( $Ticket->OwnerObj->Id == $RT::Nobody->id
+         and ( $can{'ModifyTicket'} or $Ticket->CurrentUserHasRight('TakeTicket') ) )
+    {
+        $actions->{'B'} = {
+            path => "Ticket/Display.html?Action=Take&id=" . $id,
+            title => loc('Take'),
+        };
     }
-    elsif ( $Ticket->OwnerObj->id != $session{CurrentUser}->id ) {
-        $actions->{'C'} = {path => "Ticket/Display.html?Action=Steal&id=" . $id,
-                           title => loc('Steal') };
+    elsif ( $Ticket->OwnerObj->id != $session{CurrentUser}->id 
+            and ( $can{'ModifyTicket'} or $Ticket->CurrentUserHasRight('StealTicket') ) )
+    {
+        $actions->{'C'} = {
+            path => "Ticket/Display.html?Action=Steal&id=" . $id,
+            title => loc('Steal'),
+        };
     }
 }