[Rt-commit] r16242 - in rt/branches/3.999-DANGEROUS: . lib/RT/Model share/html/Elements/GnuPG share/html/Ticket/Elements

ruz at bestpractical.com ruz at bestpractical.com
Wed Oct 8 13:21:43 EDT 2008


Author: ruz
Date: Wed Oct  8 13:21:43 2008
New Revision: 16242

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Scrip.pm
   rt/branches/3.999-DANGEROUS/share/html/Elements/GnuPG/SignEncryptWidget
   rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditBasics
   rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditPeople
   rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/Reminders
   rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowBasics
   rt/branches/3.999-DANGEROUS/share/html/Ticket/Update.html

Log:
 r16246 at ruslan-zakirovs-computer:  ruz | 2008-10-08 15:08:13 +0400
 * queue_obj -> queue


Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Scrip.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Scrip.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Scrip.pm	Wed Oct  8 13:21:43 2008
@@ -522,7 +522,7 @@
     if ( $self->SUPER::_value('queue') ) {
         return $args{'principal'}->has_right(
             right  => $args{'right'},
-            object => $self->queue_obj
+            object => $self->queue
         );
     } else {
         return $args{'principal'}->has_right(

Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/GnuPG/SignEncryptWidget
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/GnuPG/SignEncryptWidget	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/GnuPG/SignEncryptWidget	Wed Oct  8 13:21:43 2008
@@ -97,7 +97,7 @@
 <%INIT>
 return unless $self;
 
-$queue_obj ||= $ticket_obj->queue_obj if $ticket_obj;
+$queue_obj ||= $ticket_obj->queue if $ticket_obj;
 
 foreach ( qw(sign encrypt) ) {
     $self->{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
@@ -122,7 +122,7 @@
 my $checks_failure = 0;
 
 if ( $self->{'sign'} ) {
-    $queue_obj ||= $ticket_obj->queue_obj
+    $queue_obj ||= $ticket_obj->queue
         if $ticket_obj;
 
     my $address = $self->{'sign_using'};

Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditBasics
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditBasics	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditBasics	Wed Oct  8 13:21:43 2008
@@ -63,7 +63,7 @@
     <td class="label"><&|/l&>Owner</&>:</td>
       <td class="value"><& /Elements/SelectOwner,
           name         => 'owner',
-          queue_obj     => $ticket_obj->queue_obj,
+          queue_obj     => $ticket_obj->queue,
           ticket_obj    => $ticket_obj,
           default      => $ticket_obj->owner_obj->id,
           default_value => 0,

Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditPeople
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditPeople	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditPeople	Wed Oct  8 13:21:43 2008
@@ -64,7 +64,7 @@
 	group_field => $group_field, privileged_only => $privileged_only &> 
 </td><td valign="top">
 <h3><&|/l&>Owner</&></h3>
-<&|/l&>Owner</&>: <& /Elements/SelectOwner, name => 'owner', queue_obj => $ticket->queue_obj, ticket_obj => $ticket, default => $ticket->owner_obj->id, default_value => 0&>
+<&|/l&>Owner</&>: <& /Elements/SelectOwner, name => 'owner', queue_obj => $ticket->queue, ticket_obj => $ticket, default => $ticket->owner_obj->id, default_value => 0&>
 <h3><&|/l&>Current watchers</&></h3>
 <&|/l&>(Check box to delete)</&><br />
 

Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/Reminders
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/Reminders	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/Reminders	Wed Oct  8 13:21:43 2008
@@ -133,7 +133,7 @@
 <tr class="input-row">
 <td class="label">
 <label class="horizontal" for="NewReminder-Owner" ><&|/l&>Owner</&>:</label></td><td class="value">
-<& /Elements/SelectOwner, name => 'NewReminder-Owner', queue_obj => $ticket->queue_obj, default=>Jifty->web->current_user->id, default_value => 0 &>
+<& /Elements/SelectOwner, name => 'NewReminder-Owner', queue_obj => $ticket->queue, default=>Jifty->web->current_user->id, default_value => 0 &>
 </td>
 </tr>
 <tr class="input-row">
@@ -156,7 +156,7 @@
     <% $reminder->status eq 'resolved' ? 'checked="checked"' : '' %> 
 /> 
     <input type="text" size="15" name="Reminder-Subject-<% $reminder->id %>" value="<%$reminder->subject%>" /> &bull; 
-    <& /Elements/SelectOwner, name => 'Reminder-Owner-'.$reminder->id, queue => $ticket->queue_obj, default => $reminder->owner, default_value => 0  &>
+    <& /Elements/SelectOwner, name => 'Reminder-Owner-'.$reminder->id, queue => $ticket->queue, default => $reminder->owner, default_value => 0  &>
     <& /Elements/SelectDate, name => 'Reminder-Due-'.$reminder->id, default => $reminder->due_obj->date &>
     (<%$reminder->due_obj->unix>0  ? $reminder->due_obj->age_as_string : '' %>)<br />
 </%method>

Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowBasics
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowBasics	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowBasics	Wed Oct  8 13:21:43 2008
@@ -78,7 +78,7 @@
   </tr>
   <tr>
     <td class="label queue"><&|/l&>Queue</&>:</td>
-    <td class="value queue"><& ShowQueue, queue_obj => $ticket->queue_obj &></td>
+    <td class="value queue"><& ShowQueue, queue_obj => $ticket->queue &></td>
   </tr>
 % $m->callback( %ARGS, Callbackname => 'end_of_list', ticket_obj => $ticket );
 </table>

Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Update.html	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Update.html	Wed Oct  8 13:21:43 2008
@@ -71,7 +71,7 @@
 <& /Elements/SelectOwner,
      name         => "owner",
      ticket_obj    => $ticket_obj,
-     queue_obj     => $ticket_obj->queue_obj,
+     queue_obj     => $ticket_obj->queue,
      default_label => _("%1 (Unchanged)", $ticket_obj->owner_obj->name),
      default      => $ARGS{'owner'}
  &>


More information about the Rt-commit mailing list