X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FQueues_Overlay.pm;h=ff491921bea7f27d7690aba840117e229c59ed1e;hb=90edd8a914fd484e649fb0aa051dce7927bd6881;hp=06e3e12a85ef88853bfa35e438c75834175acb91;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git

diff --git a/rt/lib/RT/Queues_Overlay.pm b/rt/lib/RT/Queues_Overlay.pm
index 06e3e12a8..ff491921b 100644
--- a/rt/lib/RT/Queues_Overlay.pm
+++ b/rt/lib/RT/Queues_Overlay.pm
@@ -1,38 +1,40 @@
 # BEGIN BPS TAGGED BLOCK {{{
-# 
+#
 # COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
+#
+# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+#                                          <sales@bestpractical.com>
+#
 # (Except where explicitly superseded by other copyright notices)
-# 
-# 
+#
+#
 # LICENSE:
-# 
+#
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
 # from www.gnu.org.
-# 
+#
 # This work is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+#
+#
 # CONTRIBUTION SUBMISSION POLICY:
-# 
+#
 # (The following paragraph is not intended to limit the rights granted
 # to you to modify and distribute this software under the terms of
 # the GNU General Public License and is only of importance to you if
 # you choose to contribute your changes and enhancements to the
 # community by submitting them to Best Practical Solutions, LLC.)
-# 
+#
 # By intentionally submitting any modifications, corrections or
 # derivatives to this work, or any other work intended for use with
 # Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -41,7 +43,7 @@
 # royalty-free, perpetual, license to use, copy, create derivative
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
-# 
+#
 # END BPS TAGGED BLOCK }}}
 
 =head1 NAME
@@ -58,11 +60,6 @@
 =head1 METHODS
 
 
-=begin testing
-
-ok (require RT::Queues);
-
-=end testing
 
 =cut
 
@@ -77,6 +74,7 @@ sub _Init {
   my $self = shift;
   $self->{'table'} = "Queues";
   $self->{'primary_key'} = "id";
+  $self->{'with_disabled_column'} = 1;
 
   # By default, order by name
   $self->OrderBy( ALIAS => 'main',
@@ -87,30 +85,6 @@ sub _Init {
 }
 # }}}
 
-# {{{ sub _DoSearch 
-
-=head2 _DoSearch
-
-  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled rows never get seen unless
-we're explicitly trying to see them.
-
-=cut
-
-sub _DoSearch {
-    my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_disabled_rows'}) {
-	$self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
-}
-
-# }}}
-  
-
 # {{{ sub Limit 
 sub Limit  {
   my $self = shift;
@@ -120,35 +94,22 @@ sub Limit  {
 }
 # }}}
 
-# {{{ sub Next 
+# {{{ sub AddRecord
 
-=head2 Next
+=head2 AddRecord
 
-Returns the next queue that this user can see.
+Adds a record object to this collection if this user can see.
+This is used for filtering objects for both Next and ItemsArrayRef.
 
 =cut
-  
-sub Next {
+
+sub AddRecord {
     my $self = shift;
-    
-    
-    my $Queue = $self->SUPER::Next();
-    if ((defined($Queue)) and (ref($Queue))) {
-
-	if ($Queue->CurrentUserHasRight('SeeQueue')) {
-	    return($Queue);
-	}
-	
-	#If the user doesn't have the right to show this queue
-	else {	
-	    return($self->Next());
-	}
-    }
-    #if there never was any queue
-    else {
-	return(undef);
-    }	
-    
+    my $Queue = shift;
+    return unless $Queue->CurrentUserHasRight('SeeQueue');
+
+    push @{$self->{'items'}}, $Queue;
+    $self->{'rows'}++;
 }
 # }}}