[Rt-commit] rt branch, 3.9-merge-rtfm, updated. rt-3.9.6-1061-g07285c3

Shawn Moore sartak at bestpractical.com
Thu Dec 2 21:21:56 EST 2010


The branch, 3.9-merge-rtfm has been updated
       via  07285c399dcf246b493450549c7e577360bc3523 (commit)
      from  783447289eb09b1e580e369337422451f5471e46 (commit)

Summary of changes:
 lib/RT/FM/SearchBuilder.pm                |  154 -----------------------------
 t/articles/ArticleCollection_Overlay.pm.t |    3 +-
 t/articles/Article_Overlay.pm.t           |    3 +-
 tools/factory.mysql                       |    4 +-
 4 files changed, 4 insertions(+), 160 deletions(-)
 delete mode 100644 lib/RT/FM/SearchBuilder.pm

- Log -----------------------------------------------------------------
commit 07285c399dcf246b493450549c7e577360bc3523
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Dec 2 21:21:50 2010 -0500

    Remove RT::FM::SearchBuilder

diff --git a/lib/RT/FM/SearchBuilder.pm b/lib/RT/FM/SearchBuilder.pm
deleted file mode 100644
index 761f3fb..0000000
--- a/lib/RT/FM/SearchBuilder.pm
+++ /dev/null
@@ -1,154 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-#
-# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
-#                                          <sales at 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.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
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# 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
-
-  RT::FM::SearchBuilder - a baseclass for RT collection objects
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-
-=head1 METHODS
-
-=cut
-
-no warnings 'redefine';
-package RT::FM::SearchBuilder;
-use base qw(RT::SearchBuilder);
-use RT::FM;
-
-
-# {{{ sub LimitToEnabled
-
-=head2 LimitToEnabled
-
-Only find items that haven\'t been disabled
-
-=cut
-
-sub LimitToEnabled {
-    my $self = shift;
-    
-    $self->Limit( FIELD => 'Disabled',
-		  VALUE => '0',
-		  OPERATOR => '=' );
-}
-# }}}
-
-# {{{ sub LimitToDisabled
-
-=head2 LimitToDeleted
-
-Only find items that have been deleted.
-
-=cut
-
-sub LimitToDeleted {
-    my $self = shift;
-    
-    $self->{'find_disabled_rows'} = 1;
-    $self->Limit( FIELD => 'Disabled',
-		  OPERATOR => '=',
-		  VALUE => '1'
-		);
-}
-# }}}
-
-# {{{ sub HasEntry
-
-=item HasEntry ID
-
-If this Collection has an entry with the ID $id, returns that entry. Otherwise returns
-undef
-
-=cut
-
-sub HasEntry {
-    my $self = shift;
-    my $id = shift;
-   
-    my @items = grep {$_->Id == $id } @{$self->ItemsArrayRef};
-   
-    if ($#items > 1) {
-	die "$self HasEntry had a list with more than one of $item in it. this can never happen";
-    }
-    
-    if ($#items == -1 ) {
-	return undef;
-    }
-    else {
-	return ($items[0]);
-    }	
-
-}
-
-
-# {{{ sub CurrentUser 
-
-=head2 CurrentUser
-
-  Returns the current user as an RT::User object.
-
-=cut
-
-sub CurrentUser  {
-  my $self = shift;
-  return ($self->{'user'});
-}
-# }}}
-    
-# {{{ sub _Handle
-sub _Handle  {
-  my $self = shift;
-  return($RT::Handle);
-}
-# }}}
-1;
-
-
diff --git a/t/articles/ArticleCollection_Overlay.pm.t b/t/articles/ArticleCollection_Overlay.pm.t
index 9581342..c26ea65 100644
--- a/t/articles/ArticleCollection_Overlay.pm.t
+++ b/t/articles/ArticleCollection_Overlay.pm.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => 33;
+use RT::Test tests => 32;
 
 use_ok 'RT::FM::ArticleCollection';
 use_ok 'RT::FM::ClassCollection';
@@ -127,7 +127,6 @@ is( $arts->Count , 2, "Found 2 articles not matching 'BOGUS' for CF  ".$cf->id);
 
 my $ac = RT::FM::ArticleCollection->new($RT::SystemUser);
 ok( $ac->isa('RT::FM::ArticleCollection') );
-ok( $ac->isa('RT::FM::SearchBuilder') );
 ok( $ac->isa('DBIx::SearchBuilder') );
 ok( $ac->LimitRefersTo('http://dead.link') );
 ok( $ac->Count == 0 );
diff --git a/t/articles/Article_Overlay.pm.t b/t/articles/Article_Overlay.pm.t
index 94b40fd..569297c 100644
--- a/t/articles/Article_Overlay.pm.t
+++ b/t/articles/Article_Overlay.pm.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => 71;
+use RT::Test tests => 70;
 
 use_ok 'RT::FM::ArticleCollection';
 use_ok 'RT::FM::ClassCollection';
@@ -152,7 +152,6 @@ use RT::FM::ArticleCollection;
 
 my $articles = RT::FM::ArticleCollection->new($RT::SystemUser);
 ok($articles->isa('RT::FM::ArticleCollection'), "Created an article collection");
-ok($articles->isa('RT::FM::SearchBuilder'), "Created an article collection");
 ok($articles->isa('RT::SearchBuilder'), "Created an article collection");
 ok($articles->isa('DBIx::SearchBuilder'), "Created an article collection");
 ok($tick->URI, "The ticket does still have a URI");
diff --git a/tools/factory.mysql b/tools/factory.mysql
index 855bcd1..d04a351 100644
--- a/tools/factory.mysql
+++ b/tools/factory.mysql
@@ -5,8 +5,8 @@ use DBI;
 my $database  = shift;
 my $namespace = shift;
 
-my $CollectionBaseclass = 'RT::FM::SearchBuilder';
-my $RecordBaseclass     = 'RT::FM::Record';
+my $CollectionBaseclass = 'RT::SearchBuilder';
+my $RecordBaseclass     = 'RT::Record';
 
 my $driver   = 'mysql';
 my $hostname = 'localhost';

-----------------------------------------------------------------------


More information about the Rt-commit mailing list