[Rt-commit] r7926 - in rt/branches/3.7-EXPERIMENTAL-RTIR-2.4: lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Thu May 24 11:25:17 2007
New Revision: 7926

Modified:
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/html/Admin/Elements/ShowKeyInfo
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Users_Overlay.pm

Log:
backport fixes from 3.7-EXP to 3.7-EXP-RTIR-2.4

 * Additional bullet proofing against an error reported by Carlos Fuentes
 * Use the API for finding ACLEquivalenceObjects on search



Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/html/Admin/Elements/ShowKeyInfo
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/html/Admin/Elements/ShowKeyInfo	(original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/html/Admin/Elements/ShowKeyInfo	Thu May 24 11:25:17 2007
@@ -64,7 +64,7 @@
 % foreach my $uinfo( @{ $res{'info'}{'User'} } ) {
 <tr><th><% loc('User (created - expire)') %>:</th>
 <td><% $uinfo->{'String'} %>\
-(<% $uinfo->{'Created'}->AsString( Time => 0 ) %> - \
+(<% $uinfo->{'Created'}? $uinfo->{'Created'}->AsString( Time => 0 ): loc('never') %> - \
 <% $uinfo->{'Expire'}? $uinfo->{'Expire'}->AsString( Time => 0 ): loc('never') %>)
 </td></tr>
 % }

Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Users_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Users_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Users_Overlay.pm	Thu May 24 11:25:17 2007
@@ -403,7 +403,7 @@
 
         # XXX: This should be abstracted into object itself
         if( $args{'Object'}->id ) {
-            push @objects, $args{'Object'}->QueueObj;
+            push @objects, $args{'Object'}->ACLEquivalenceObjects;
         } else {
             push @objects, 'RT::Queue';
         }