[rt-commit] [svn] r616 - rt/branches/rt-3.1/lib/RT

leira at fsck.com leira at fsck.com
Wed Mar 24 16:29:02 EST 2004


Author: leira
Date: Wed Mar 24 16:29:01 2004
New Revision: 616

Modified:
   rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm
   rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
Log:
Check Queue permissions, too.


Modified: rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm	Wed Mar 24 16:29:01 2004
@@ -117,10 +117,12 @@
     my $Attachment = $self->SUPER::Next();
     if ((defined($Attachment)) and (ref($Attachment))) {
 	if ($Attachment->TransactionObj->__Value('Type') =~ /^Comment/ && 
-	    $Attachment->TransactionObj->TicketObj->CurrentUserHasRight('ShowTicketComments')) {
+	    ($Attachment->TransactionObj->TicketObj->QueueObj->CurrentUserHasRight('ShowTicket') ||
+	     	    $Attachment->TransactionObj->TicketObj->CurrentUserHasRight('ShowTicketComments'))) {
 	    return($Attachment);
 	} elsif ($Attachment->TransactionObj->__Value('Type') !~ /^Comment/ && 
-		 $Attachment->TransactionObj->TicketObj->CurrentUserHasRight('ShowTicket')) {
+		 ($Attachment->TransactionObj->TicketObj->QueueObj->CurrentUserHasRight('ShowTicket') ||
+		  $Attachment->TransactionObj->TicketObj->CurrentUserHasRight('ShowTicket'))) {
 	    return($Attachment);
 	}
 

Modified: rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm	Wed Mar 24 16:29:01 2004
@@ -69,10 +69,12 @@
     my $Transaction = $self->SUPER::Next();
     if ((defined($Transaction)) and (ref($Transaction))) {
 	if ($Transaction->__Value('Type') =~ /^Comment/ && 
-	    $Transaction->TicketObj->CurrentUserHasRight('ShowTicketComments')) {
+	    ($Transaction->TicketObj->QueueObj->CurrentUserHasRight('ShowTicket') ||
+	     $Transaction->TicketObj->CurrentUserHasRight('ShowTicketComments'))) {
 	    return($Transaction);
 	} elsif ($Transaction->__Value('Type') !~ /^Comment/ && 
-		 $Transaction->TicketObj->CurrentUserHasRight('ShowTicket')) {
+		 ($Transaction->TicketObj->QueueObj->CurrentUserHasRight('ShowTicket') ||
+		  $Transaction->TicketObj->CurrentUserHasRight('ShowTicket'))) {
 	    return($Transaction);
 	}
 



More information about the Rt-commit mailing list