[Rt-commit] r17937 - in rt/3.8/trunk/share/html/Search: Elements

[elacour at bestpractical.com]

Author: elacour
Date: Tue Jan 27 10:38:29 2009
New Revision: 17937

Modified:
   rt/3.8/trunk/share/html/Search/Bulk.html
   rt/3.8/trunk/share/html/Search/Elements/PickBasics

Log:
Revert commits that tried to fix the count of Owners displayed in Build.html/Bulk.html as it needs more discuss.

Modified: rt/3.8/trunk/share/html/Search/Bulk.html
==============================================================================
--- rt/3.8/trunk/share/html/Search/Bulk.html	(original)
+++ rt/3.8/trunk/share/html/Search/Bulk.html	Tue Jan 27 10:38:29 2009
@@ -87,7 +87,7 @@
 <td valign="top">
 <table>
 <tr><td class="label"> <&|/l&>Make Owner</&>: </td>
-<td class="value"> <& /Elements/SelectOwner, Name => "Owner", QueueObj => @OwnerQueues &> (<input type="checkbox" class="checkbox" name="ForceOwnerChange" /> <&|/l&>Force change</&>) </td></tr>
+<td class="value"> <& /Elements/SelectOwner, Name => "Owner" &> (<input type="checkbox" class="checkbox" name="ForceOwnerChange" /> <&|/l&>Force change</&>) </td></tr>
 <tr><td class="label"> <&|/l&>Add Requestor</&>: </td>
 <td class="value"> <input name="AddRequestor" size="20" /> </td></tr>
 <tr><td class="label"> <&|/l&>Remove Requestor</&>: </td>
@@ -221,18 +221,6 @@
 
 
 <%INIT>
-
-# Queues to give to SelectOwner to restrict it
-my @OwnerQueues;
-my $Queues = RT::Queues->new( $session{'CurrentUser'} );
-$Queues->UnLimit;
-while ( my $Queue = $Queues->Next() ) {
-    my $Can = $session{CurrentUser}->HasRight( Right => 'CreateTicket', Object => $Queue )
-              || $session{CurrentUser}->HasRight( Right => 'ModifyTicket', Object => $Queue );
-    push( @OwnerQueues, $Queue ) if ( $Can );
-}
-
-
 unless ( defined $Rows ) {
     $Rows = $RowsPerPage;
     $ARGS{Rows} = $RowsPerPage;

Modified: rt/3.8/trunk/share/html/Search/Elements/PickBasics
==============================================================================
--- rt/3.8/trunk/share/html/Search/Elements/PickBasics	(original)
+++ rt/3.8/trunk/share/html/Search/Elements/PickBasics	Tue Jan 27 10:38:29 2009
@@ -50,16 +50,6 @@
 % }
 <%INIT>
 
-# Queues to give to SelectOwner to restrict it
-my @OwnerQueues;
-my $Queues = RT::Queues->new( $session{'CurrentUser'} );
-$Queues->UnLimit;
-while ( my $Queue = $Queues->Next() ) {
-    my $Can = $session{CurrentUser}->HasRight( Right => 'SeeQueue', Object => $Queue )
-              || $session{CurrentUser}->HasRight( Right => 'ShowTicket', Object => $Queue );
-    push( @OwnerQueues, $Queue ) if ( $Can );
-}
-
 my @lines = (
     {
         Name => 'id',
@@ -134,7 +124,7 @@
         Value => {
             Type => 'component',
             Path => '/Elements/SelectOwner',
-            Arguments => { ValueAttribute => 'Name', QueueObj => @OwnerQueues },
+            Arguments => { ValueAttribute => 'Name' },
         },
     },
     {