[Rt-commit] r13747 - in rt/branches/3.999-DANGEROUS: lib/RT/Model

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Jul  2 22:56:06 2008
New Revision: 13747

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm

Log:
 r14021 at sunnavys-mb:  sunnavy | 2008-07-03 10:53:19 +0800
 tiny changes


Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm	Wed Jul  2 22:56:06 2008
@@ -700,7 +700,7 @@
                 return ( 0, _('Permission Denied') );
             }
         } else {
-            Jifty->log->warn("$self -> AddWatcher got passed a bogus type");
+            Jifty->log->warn("$self -> add_watcher got passed a bogus type");
             return ( 0, _('Error in parameters to Queue->add_watcher') );
         }
     }
@@ -847,7 +847,7 @@
 
     # {{{ Check ACLS
     #If the watcher we're trying to add is for the current user
-    if ( $self->current_user->id eq $args{'principal_id'} ) {
+    if ( $self->current_user->principal_id eq $args{'principal_id'} ) {
 
         #  If it's an AdminCc and they don't have
         #   'WatchAsAdminCc' or 'ModifyQueue', bail
@@ -861,16 +861,15 @@
 
         #  If it's a Requestor or Cc and they don't have
         #   'Watch' or 'ModifyQueue', bail
-        elsif (( $args{'type'} eq 'cc' )
-            or ( $args{'type'} eq 'requestor' ) )
-        {
+        elsif (( $args{'type'} eq 'cc' ) or ( $args{'type'} eq 'requestor' ) ) {
+
             unless ( $self->current_user_has_right('ModifyQueueWatchers')
                 or $self->current_user_has_right('Watch') )
             {
                 return ( 0, _('Permission Denied') );
             }
         } else {
-            Jifty->log->warn("$self -> DeleteWatcher got passed a bogus type");
+            Jifty->log->warn("$self -> delete_watcher got passed a bogus type");
             return ( 0, _('Error in parameters to Queue->delete_watcher') );
         }
     }