[Rt-commit] r15690 - in rt/branches/3.999-DANGEROUS: lib/RT/Condition lib/RT/Graph lib/RT/Interface lib/RT/Model lib/RT/ScripAction lib/RT/Shredder share/html/Elements/RT__Model__Ticket t/api

ruz at bestpractical.com ruz at bestpractical.com
Mon Sep 1 22:58:36 EDT 2008


Author: ruz
Date: Mon Sep  1 22:58:36 2008
New Revision: 15690

Modified:
   rt/branches/3.999-DANGEROUS/lib/RT/Condition/CloseTicket.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Condition/ReopenTicket.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Graph/Tickets.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripAction.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCollection.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Template.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Shredder/CustomField.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Scrip.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Template.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Ticket.pm
   rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Template.html
   rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Ticket/ColumnMap
   rt/branches/3.999-DANGEROUS/t/api/user.t

Log:
* more switch to references instead of *_obj methods

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition/CloseTicket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition/CloseTicket.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition/CloseTicket.pm	Mon Sep  1 22:58:36 2008
@@ -68,7 +68,7 @@
         unless $txn->type eq "Status"
             || ( $txn->type eq "Set" && $txn->field eq "Status" );
 
-    my $queue = $self->ticket_obj->queue_obj;
+    my $queue = $self->ticket_obj->queue;
     return 0 unless $queue->is_active_status( $txn->old_value );
     return 0 unless $queue->is_inactive_status( $txn->new_value );
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition/ReopenTicket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition/ReopenTicket.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition/ReopenTicket.pm	Mon Sep  1 22:58:36 2008
@@ -68,7 +68,7 @@
         unless $txn->type eq "Status"
             || ( $txn->type eq "Set" && $txn->field eq "Status" );
 
-    my $queue = $self->ticket_obj->queue_obj;
+    my $queue = $self->ticket_obj->queue;
     return 0 unless $queue->is_inactive_status( $txn->old_value );
     return 0 unless $queue->is_active_status( $txn->new_value );
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Graph/Tickets.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Graph/Tickets.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Graph/Tickets.pm	Mon Sep  1 22:58:36 2008
@@ -111,7 +111,7 @@
 our ( %fill_cache, @available_colors ) = ();
 
 our %property_cb = (
-    Queue => sub { return $_[0]->queue_obj->name || $_[0]->queue },
+    Queue => sub { return $_[0]->queue->name || $_[0]->queue },
     CF => sub {
         my $values = $_[0]->custom_field_values( $_[1] );
         return join ', ', map $_->content, @{ $values->items_array_ref };

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	Mon Sep  1 22:58:36 2008
@@ -348,7 +348,7 @@
             {
                 $crypt{$argument} = $attachment->get_header("X-RT-$argument");
             } elsif ( $args{'ticket'} ) {
-                $crypt{$argument} = $args{'ticket'}->queue_obj->$argument();
+                $crypt{$argument} = $args{'ticket'}->queue->$argument();
             }
         }
 
@@ -631,7 +631,7 @@
         # XXX: what if want to forward txn of other object than ticket?
         my $obj = $txn->object;
         $subject = add_subject_tag( $subject, $obj );
-        $from = $obj->queue_obj->correspond_address
+        $from = $obj->queue->correspond_address
             || RT->config->get('CorrespondAddress');
     }
     $mail->head->set( subject => "Fwd: $subject" );
@@ -1025,7 +1025,7 @@
         $ticket = $tmp;
     }
     my $id        = $ticket->id;
-    my $queue_tag = $ticket->queue_obj->subject_tag;
+    my $queue_tag = $ticket->queue->subject_tag;
 
     my $tag_re = RT->config->get('EmailSubjectTagRegex');
     unless ($tag_re) {

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm	Mon Sep  1 22:58:36 2008
@@ -635,7 +635,7 @@
         $type = qq{x-application-rt\/gpg-encrypted; original-type="$type"};
     }
 
-    my $queue = $txn->ticket_obj->queue_obj;
+    my $queue = $txn->ticket_obj->queue;
     my $encrypt_for;
     foreach my $address ( grep $_, $queue->correspond_address, $queue->comment_address, RT->config->get('CorrespondAddress'), RT->config->get('CommentAddress'), ) {
         my %res = RT::Crypt::GnuPG::get_keys_info( $address, 'private' );

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripAction.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripAction.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripAction.pm	Mon Sep  1 22:58:36 2008
@@ -183,7 +183,7 @@
         {
             my $tmptemplate = RT::Model::Template->new;
             my ( $ok, $err ) = $tmptemplate->load_queue_template(
-                queue => $self->{'_ticket_obj'}->queue_obj->id,
+                queue => $self->{'_ticket_obj'}->queue->id,
                 name  => $self->{'template_obj'}->name
             );
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCollection.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCollection.pm	Mon Sep  1 22:58:36 2008
@@ -312,7 +312,7 @@
         @_
     );
 
-    $self->limit_to_queue( $self->{'ticket_obj'}->queue_obj->id );    #Limit it to  $Ticket->queue_obj->id
+    $self->limit_to_queue( $self->{'ticket_obj'}->queue->id );    #Limit it to  $Ticket->queue->id
     $self->limit_to_global();
 
     # or to "global"

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Template.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Template.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Template.pm	Mon Sep  1 22:58:36 2008
@@ -78,7 +78,7 @@
 use base qw'RT::Record';
 use Jifty::DBI::Schema;
 use Jifty::DBI::Record schema {
-    column queue => max_length is 11,  type is 'int',          default is '0';
+    column queue => references RT::Model::Queue;
     column name  => max_length is 200, type is 'varchar(200)', default is '';
     column
         description => max_length is 255,
@@ -86,9 +86,9 @@
     column type => max_length is 16, type is 'varchar(16)', default is '';
     column content => type is 'text', default is '', filters are 'Jifty::DBI::Filter::utf8';
     column last_updated    => type is 'timestamp';
-    column last_updated_by => max_length is 11, type is 'int', default is '0';
-    column creator         => max_length is 11, type is 'int', default is '0';
+    column last_updated_by => references RT::Model::User;
     column created         => type is 'timestamp';
+    column creator         => references RT::Model::User;
 
 };
 
@@ -503,11 +503,12 @@
 
 sub current_user_has_queue_right {
     my $self = shift;
-    return ( $self->queue_obj->current_user_has_right(@_) );
+    return ( $self->queue->current_user_has_right(@_) );
 }
 
 
 sub queue_obj {
+    require Carp; Carp::confess("deprecated");
     my $self = shift;
     my $q    = RT::Model::Queue->new;
     $q->load( $self->__value('queue') );

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm	Mon Sep  1 22:58:36 2008
@@ -1279,7 +1279,7 @@
         return ( 0, _("That queue does not exist") );
     }
 
-    if ( $Newqueue_obj->id == $self->queue_obj->id ) {
+    if ( $Newqueue_obj->id == $self->queue->id ) {
         return ( 0, _('That is the same value') );
     }
     unless (
@@ -1337,6 +1337,7 @@
 =cut
 
 sub queue_obj {
+    require Carp; Carp::carp('deprecated');
     my $self = shift;
 
     my $queue_obj = RT::Model::Queue->new;
@@ -2413,7 +2414,7 @@
     my $status = shift;
 
     #Make sure the status passed in is valid
-    unless ( $self->queue_obj->is_valid_status($status) ) {
+    unless ( $self->queue->is_valid_status($status) ) {
         return (undef);
     }
 
@@ -2481,7 +2482,7 @@
 
     #When we close a ticket, set the 'resolved' attribute to now.
     # It's misnamed, but that's just historical.
-    if ( $self->queue_obj->is_inactive_status( $args{status} ) ) {
+    if ( $self->queue->is_inactive_status( $args{status} ) ) {
         $self->_set(
             column             => 'resolved',
             value              => $now->iso,
@@ -2872,7 +2873,7 @@
 
 sub transaction_custom_fields {
     my $self = shift;
-    return $self->queue_obj->ticket_transaction_custom_fields;
+    return $self->queue->ticket_transaction_custom_fields;
 }
 
 
@@ -2931,7 +2932,7 @@
 
 sub acl_equivalence_objects {
     my $self = shift;
-    return $self->queue_obj;
+    return $self->queue;
 
 }
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm	Mon Sep  1 22:58:36 2008
@@ -91,8 +91,8 @@
     my $friendly_name;
 
     if ( RT->config->get('UseFriendlyFromLine') ) {
-        $friendly_name = $self->ticket_obj->queue_obj->description
-          || $self->ticket_obj->queue_obj->name;
+        $friendly_name = $self->ticket_obj->queue->description
+          || $self->ticket_obj->queue->name;
     }
 
     $self->SUPER::set_return_address( @_, friendly_name => $friendly_name );

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm	Mon Sep  1 22:58:36 2008
@@ -926,7 +926,7 @@
     my $t    = shift;
 
     my $string;
-    $string .= "Queue: " . $t->queue_obj->name . "\n";
+    $string .= "Queue: " . $t->queue->name . "\n";
     $string .= "Subject: " . $t->subject . "\n";
     $string .= "Status: " . $t->status . "\n";
     $string .= "UpdateType: correspond\n";

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm	Mon Sep  1 22:58:36 2008
@@ -100,10 +100,10 @@
         #If we have a To, make the Ccs, Ccs, otherwise, promote them to To
         if (@To) {
             push( @Cc, $ticket->role_group("cc")->member_emails );
-            push( @Cc, $ticket->queue_obj->role_group("cc")->member_emails );
+            push( @Cc, $ticket->queue->role_group("cc")->member_emails );
         } else {
             push( @Cc, $ticket->role_group("cc")->member_emails );
-            push( @To, $ticket->queue_obj->role_group("cc")->member_emails );
+            push( @To, $ticket->queue->role_group("cc")->member_emails );
         }
     }
 
@@ -120,7 +120,7 @@
     }
     if ( $arg =~ /\bAdmin_?Cc\b/i ) {
         push( @Bcc, $ticket->role_group("admin_cc")->member_emails );
-        push( @Bcc, $ticket->queue_obj->role_group("admin_cc")->member_emails );
+        push( @Bcc, $ticket->queue->role_group("admin_cc")->member_emails );
     }
 
     if ( RT->config->get('UseFriendlyToLine') ) {

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm	Mon Sep  1 22:58:36 2008
@@ -118,7 +118,7 @@
             {
                 $crypt{$argument} = $attachment->get_header("X-RT-$argument");
             } else {
-                $crypt{$argument} = $self->ticket_obj->queue_obj->$argument();
+                $crypt{$argument} = $self->ticket_obj->queue->$argument();
             }
         }
         if ( $crypt{'sign'} || $crypt{'encrypt'} ) {
@@ -218,7 +218,7 @@
 
     my $attachment = $self->transaction_obj->attachments->first;
     if ( $attachment
-        && !( $attachment->get_header('X-RT-Encrypt') || $self->ticket_obj->queue_obj->encrypt ) )
+        && !( $attachment->get_header('X-RT-Encrypt') || $self->ticket_obj->queue->encrypt ) )
     {
         $attachment->set_header( 'X-RT-Encrypt' => 1 )
             if $attachment->get_header("X-RT-Incoming-Encryption")
@@ -847,10 +847,10 @@
     my $replyto;
 
     if ( $args{'is_comment'} ) {
-        $replyto = $self->ticket_obj->queue_obj->comment_address
+        $replyto = $self->ticket_obj->queue->comment_address
             || RT->config->get('CommentAddress');
     } else {
-        $replyto = $self->ticket_obj->queue_obj->correspond_address
+        $replyto = $self->ticket_obj->queue->correspond_address
             || RT->config->get('CorrespondAddress');
     }
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/CustomField.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/CustomField.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/CustomField.pm	Mon Sep  1 22:58:36 2008
@@ -101,7 +101,7 @@
     # Queue
     # Skip if it's global CF
     if ( $self->queue ) {
-        if ( $self->queue_obj && $self->queue_obj->id ) {
+        if ( $self->queue && $self->queue->id ) {
             push( @$list, $obj );
         } else {
             my $rec = $args{'shredder'}->get_record( object => $self );

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Scrip.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Scrip.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Scrip.pm	Mon Sep  1 22:58:36 2008
@@ -84,7 +84,7 @@
     my $list = [];
 
     # Queue
-    my $obj = $self->queue_obj;
+    my $obj = $self->queue;
     if ( defined $obj->id ) {
         push( @$list, $obj );
     } else {

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Template.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Template.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Template.pm	Mon Sep  1 22:58:36 2008
@@ -93,7 +93,7 @@
     my $list = [];
 
     # Queue
-    my $obj = $self->queue_obj;
+    my $obj = $self->queue;
     if ( $obj && defined $obj->id ) {
         push( @$list, $obj );
     } else {

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Ticket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Ticket.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Ticket.pm	Mon Sep  1 22:58:36 2008
@@ -102,7 +102,7 @@
     my $list = [];
 
     # Queue
-    my $obj = $self->queue_obj;
+    my $obj = $self->queue;
     if ( $obj && defined $obj->id ) {
         push( @$list, $obj );
     } else {

Modified: rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Template.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Template.html	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Template.html	Mon Sep  1 22:58:36 2008
@@ -104,8 +104,8 @@
 }
 my $queue_obj;
 if ($template_obj->id()) {
-  $queue = $template_obj->queue;
-  $queue_obj = $template_obj->queue_obj;
+  $queue_obj = $template_obj->queue;
+  $queue = $queue_obj->id;
 
   my @attribs = qw( description content queue name);
   my @aresults = update_record_object( attributes_ref => \@attribs, 

Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Ticket/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Ticket/ColumnMap	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Ticket/ColumnMap	Mon Sep  1 22:58:36 2008
@@ -78,12 +78,12 @@
     queue => {
         attribute => 'queue',
         title     => 'Queue id',
-        value     => sub { return $_[0]->queue }
+        value     => sub { return $_[0]->queue_id }
     },
     queue_name => {
         attribute => 'queue',
         title     => 'queue',
-        value     => sub  { return $_[0]->queue_obj->name }
+        value     => sub  { return $_[0]->queue->name }
     },
     owner_name => {
         title     => 'Owner',

Modified: rt/branches/3.999-DANGEROUS/t/api/user.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/user.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/api/user.t	Mon Sep  1 22:58:36 2008
@@ -162,7 +162,7 @@
 my $new_tick2 = RT::Model::Ticket->new(current_user => RT->system_user);
 (my $tick2id, $tickmsg) = $new_tick2->create(subject=> 'ACL Test 2', queue =>$q_as_system->id);
 ok($tick2id, "Created ticket: $tick2id");
-is($new_tick2->queue_obj->id, $q_as_system->id, "Created a new ticket in queue 1");
+is($new_tick2->queue->id, $q_as_system->id, "Created a new ticket in queue 1");
 
 
 # make sure that the user can't do this without subgroup membership
@@ -258,7 +258,7 @@
 
 # Before we start Make sure the user does not have the right to modify tickets in the queue
 ok (!$new_user->has_right( object => $new_tick2, right => 'ModifyTicket'), "User can not modify the ticket without it being granted");
-ok (!$new_user->has_right( object => $new_tick2->queue_obj, right => 'ModifyTicket'), "User can not modify tickets in the queue without it being granted");
+ok (!$new_user->has_right( object => $new_tick2->queue, right => 'ModifyTicket'), "User can not modify tickets in the queue without it being granted");
 
 # Grant queue admin cc the right to modify ticket in the queue 
 ok(($qv,$qm) = $q_as_system->role_group("admin_cc")->principal_object->grant_right( object => RT->system, right => 'ModifyTicket'),"Granted the queue adminccs the right to modify tickets");
@@ -266,7 +266,7 @@
 
 # Make sure the user can't modify the ticket before they're added as a watcher
 ok (!$new_user->has_right( object => $new_tick2, right => 'ModifyTicket'), "User can not modify the ticket without being an admincc");
-ok (!$new_user->has_right( object => $new_tick2->queue_obj, right => 'ModifyTicket'), "User can not modify tickets in the queue without being an admincc");
+ok (!$new_user->has_right( object => $new_tick2->queue, right => 'ModifyTicket'), "User can not modify tickets in the queue without being an admincc");
 
 # Add the user as a queue admincc
 ok (($add_id, $add_msg) = $q_as_system->add_watcher(type => 'admin_cc', principal_id => $new_user->principal_id)  , "Added the new user as a queue admincc");
@@ -274,20 +274,20 @@
 
 # Make sure the user does have the right to modify tickets in the queue
 ok ($new_user->has_right( object => $new_tick2, right => 'ModifyTicket'), "User can modify the ticket as an admincc");
-ok ($new_user->has_right( object => $new_tick2->queue_obj, right => 'ModifyTicket'), "User can modify tickets in the queue as an admincc");
+ok ($new_user->has_right( object => $new_tick2->queue, right => 'ModifyTicket'), "User can modify tickets in the queue as an admincc");
 # Remove the user from the role  group
 ok (($del_id, $del_msg) = $q_as_system->delete_watcher(type => 'admin_cc', principal_id => $new_user->principal_id)  , "Deleted the new user as a queue admincc");
 
 # Make sure the user doesn't have the right to modify tickets in the queue
 ok (!$new_user->has_right( object => $new_tick2, right => 'ModifyTicket'), "User can't modify the ticket without group membership");
-ok (!$new_user->has_right( object => $new_tick2->queue_obj, right => 'ModifyTicket'), "User can't modify tickets in the queue without group membership");
+ok (!$new_user->has_right( object => $new_tick2->queue, right => 'ModifyTicket'), "User can't modify tickets in the queue without group membership");
 
 # }}}
 
 # {{{ Test the user's right to modify a ticket as a _ticket_ admincc with the Right granted at the _queue_ level
 
 ok (!$new_user->has_right( object => $new_tick2, right => 'ModifyTicket'), "User can not modify the ticket without being an admincc");
-ok (!$new_user->has_right( object => $new_tick2->queue_obj, right => 'ModifyTicket'), "User can not modify tickets in the queue obj without being an admincc");
+ok (!$new_user->has_right( object => $new_tick2->queue, right => 'ModifyTicket'), "User can not modify tickets in the queue obj without being an admincc");
 
 
 # Add the user as a ticket admincc
@@ -296,14 +296,14 @@
 
 # Make sure the user does have the right to modify tickets in the queue
 ok ($new_user->has_right( object => $new_tick2, right => 'ModifyTicket'), "User can modify the ticket as an admincc");
-ok (!$new_user->has_right( object => $new_tick2->queue_obj, right => 'ModifyTicket'), "User can not modify tickets in the queue obj being only a ticket admincc");
+ok (!$new_user->has_right( object => $new_tick2->queue, right => 'ModifyTicket'), "User can not modify tickets in the queue obj being only a ticket admincc");
 
 # Remove the user from the role  group
 ok ( ($del_id, $del_msg) = $new_tick2->delete_watcher(type => 'admin_cc', principal_id => $new_user->principal_id)  , "Deleted the new user as a queue admincc");
 
 # Make sure the user doesn't have the right to modify tickets in the queue
 ok (!$new_user->has_right( object => $new_tick2, right => 'ModifyTicket'), "User can't modify the ticket without being an admincc");
-ok (!$new_user->has_right( object => $new_tick2->queue_obj, right => 'ModifyTicket'), "User can not modify tickets in the queue obj without being an admincc");
+ok (!$new_user->has_right( object => $new_tick2->queue, right => 'ModifyTicket'), "User can not modify tickets in the queue obj without being an admincc");
 
 
 # Revoke the right to modify ticket in the queue 


More information about the Rt-commit mailing list