[Rt-commit] r18994 - in rt/3.999/trunk: sbin share/html/Ticket t/api t/maildigest

[ruz at bestpractical.com]

Author: ruz
Date: Tue Mar 31 05:21:16 2009
New Revision: 18994

Modified:
   rt/3.999/trunk/sbin/rt-email-digest
   rt/3.999/trunk/share/html/Ticket/Elements/ShowMessageHeaders
   rt/3.999/trunk/share/html/Ticket/Elements/ShowMessageStanza
   rt/3.999/trunk/share/html/Ticket/GnuPG.html
   rt/3.999/trunk/t/api/groups.t
   rt/3.999/trunk/t/maildigest/attributes.t

Log:
* change more not converted calls

Modified: rt/3.999/trunk/sbin/rt-email-digest
==============================================================================
--- rt/3.999/trunk/sbin/rt-email-digest	(original)
+++ rt/3.999/trunk/sbin/rt-email-digest	Tue Mar 31 05:21:16 2009
@@ -239,7 +239,7 @@
 
     while ( my $txn = $txns->next ) {
         my $ticket = $txn->ticket;
-        my $queue  = $txn->ticket_obj->queue->name;
+        my $queue  = $ticket->queue->name;
         # Xxx todo - may clobber if two queues have the same name
         foreach my $user ( $txn->deferred_recipients($frequency) ) {
             $all_digest->{$user}->{$queue}->{$ticket->id}->{ $txn->id } = $txn->content_obj;

Modified: rt/3.999/trunk/share/html/Ticket/Elements/ShowMessageHeaders
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/ShowMessageHeaders	(original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/ShowMessageHeaders	Tue Mar 31 05:21:16 2009
@@ -75,7 +75,7 @@
     @headers = grep $display_headers{ lc $_->{'tag'} }, @headers;
 }
 
-my $ticket = $message->transaction->ticket_obj;
+my $ticket = $message->transaction->ticket;
 foreach my $f (@headers) {
     $m->comp('/Elements/MakeClicky', content => \$f->{'value'}, ticket => $ticket, %ARGS);
 }

Modified: rt/3.999/trunk/share/html/Ticket/Elements/ShowMessageStanza
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/ShowMessageStanza	(original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/ShowMessageStanza	Tue Mar 31 05:21:16 2009
@@ -88,7 +88,7 @@
 <%INIT>
 my $plain_text_pre = RT->config->get('PlainTextPre', Jifty->web->current_user);
 
-my $ticket = $transaction ? $transaction->ticket_obj : undef;
+my $ticket = $transaction ? $transaction->ticket : undef;
 
 my $print_content = sub  {
     my $ref = shift;

Modified: rt/3.999/trunk/share/html/Ticket/GnuPG.html
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/GnuPG.html	(original)
+++ rt/3.999/trunk/share/html/Ticket/GnuPG.html	Tue Mar 31 05:21:16 2009
@@ -48,7 +48,7 @@
 
 <&| /_elements/wrapper, title => $title &>
 <& /Ticket/Elements/Tabs,
-    ticket => $txn->ticket_obj,
+    ticket => $txn->ticket,
     current_tab => 'Ticket/Encrypt.html?id='. $id,
     title => $title,
 &>

Modified: rt/3.999/trunk/t/api/groups.t
==============================================================================
--- rt/3.999/trunk/t/api/groups.t	(original)
+++ rt/3.999/trunk/t/api/groups.t	Tue Mar 31 05:21:16 2009
@@ -37,13 +37,13 @@
 ($id, $msg) = $g->create_user_defined(name => 'Membertests');
 ok ($id, $msg);
 
-my ($aid, $amsg) =$g->add_member($u->id);
+my ($aid, $amsg) = $g->add_member($u->id);
 ok ($aid, $amsg);
 ok($g->has_member( principal => $u->principal),"G has member u");
 
 my $groups = RT::Model::GroupCollection->new(current_user => RT->system_user);
 $groups->limit_to_user_defined_groups();
-$groups->with_member(principal_id => $u->id);
+$groups->with_member(principal => $u->id);
 is ($groups->count , 1,"found the 1 group - " . $groups->count);
 is ($groups->first->id , $g->id, "it's the right one");
 
@@ -89,7 +89,7 @@
 *RTx::System::id = sub  { 1; };
 *RTx::System::id = *RTx::System::id;
 my $ace = RT::Model::ACE->new(current_user => RT->system_user);
-($id, $msg) = $ace->RT::Record::create( principal_id => $RTxGroup->id, type => 'Group', right_name => 'RTxGroupRight', object_type => 'RTx::System', object_id  => 1);
+($id, $msg) = $ace->RT::Record::create( principal => $RTxGroup->id, type => 'Group', right_name => 'RTxGroupRight', object_type => 'RTx::System', object_id  => 1);
 ok ($id, "ACL for RTxSysObj Created");
 
 my $RTxObj = {};
@@ -111,7 +111,7 @@
 
 use RT::Model::ACE;
 $ace = RT::Model::ACE->new(current_user => RT->system_user);
-($id, $msg) = $ace->RT::Record::create( principal_id => $RTxGroup->id, type => 'Group', right_name => 'RTxGroupRight', object_type => 'RTx::System::Record', object_id  => 5 );
+($id, $msg) = $ace->RT::Record::create( principal => $RTxGroup->id, type => 'Group', right_name => 'RTxGroupRight', object_type => 'RTx::System::Record', object_id  => 5 );
 ok ($id, "ACL for RTxObj Created");
 
 my $RTxObj2 = {};

Modified: rt/3.999/trunk/t/maildigest/attributes.t
==============================================================================
--- rt/3.999/trunk/t/maildigest/attributes.t	(original)
+++ rt/3.999/trunk/t/maildigest/attributes.t	Tue Mar 31 05:21:16 2009
@@ -61,7 +61,7 @@
 						    object => $testq );
 ok( $ret || $msg =~ /already has/, "Granted dduser AdminQueue on testq: $msg" );
 ( $ret, $msg ) = $testq->add_watcher( type => 'admin_cc',
-			     principal_id => $user_d->principal->id );
+			     principal => $user_d->principal );
 ok( $ret || $msg =~ /already/, "dduser added as a queue watcher: $msg" );
 
 # Give the others queue rights.
@@ -86,10 +86,10 @@
 
 # Make the other users ticket watchers.
 ( $ret, $msg ) = $ticket->add_watcher( type => 'cc',
-		      principal_id => $user_n->principal->id );
+		      principal => $user_n->principal );
 ok( $ret, "Added user_n as a ticket watcher: $msg" );
 ( $ret, $msg ) = $ticket->add_watcher( type => 'cc',
-		      principal_id => $user_s->principal->id );
+		      principal => $user_s->principal );
 ok( $ret, "Added user_s as a ticket watcher: $msg" );
 
 my $obj;