Merge branch 'master' of https://github.com/jgoodman/Freeside

[freeside.git] / rt / lib / RT / Principals.pm

diff --git a/rt/lib/RT/Principals.pm b/rt/lib/RT/Principals.pm
index 3410521..145ec17 100644 (file)
--- a/rt/lib/RT/Principals.pm
+++ b/rt/lib/RT/Principals.pm
@@ -1,40 +1,40 @@
 # BEGIN BPS TAGGED BLOCK {{{
-# 
+#
 # COPYRIGHT:
-# 
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-#                                          <jesse@bestpractical.com>
-# 
+#
+# This software is Copyright (c) 1996-2014 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., 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
@@ -43,48 +43,42 @@
 # 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 }}}
-
-# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
-# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
-# 
-# !! DO NOT EDIT THIS FILE !!
 #
-
-use strict;
-
+# END BPS TAGGED BLOCK }}}
 
 =head1 NAME
 
-  RT::Principals -- Class Description
- 
+  RT::Principals - a collection of RT::Principal objects
+
 =head1 SYNOPSIS
 
-  use RT::Principals
+  use RT::Principals;
 
 =head1 DESCRIPTION
 
 
 =head1 METHODS
 
+
+
 =cut
 
+
 package RT::Principals;
 
-use RT::SearchBuilder;
+use strict;
+use warnings;
+
+
 use RT::Principal;
 
-use vars qw( @ISA );
-@ISA= qw(RT::SearchBuilder);
+use base 'RT::SearchBuilder';
 
+sub Table { 'Principals'}
 
 sub _Init {
     my $self = shift;
-    $self->{'table'} = 'Principals';
-    $self->{'primary_key'} = 'id';
-
-
+    $self->{'with_disabled_column'} = 1;
     return ( $self->SUPER::_Init(@_) );
 }
 
@@ -99,42 +93,6 @@ sub NewItem {
     my $self = shift;
     return(RT::Principal->new($self->CurrentUser));
 }
-
-        eval "require RT::Principals_Overlay";
-        if ($@ && $@ !~ qr{^Can't locate RT/Principals_Overlay.pm}) {
-            die $@;
-        };
-
-        eval "require RT::Principals_Vendor";
-        if ($@ && $@ !~ qr{^Can't locate RT/Principals_Vendor.pm}) {
-            die $@;
-        };
-
-        eval "require RT::Principals_Local";
-        if ($@ && $@ !~ qr{^Can't locate RT/Principals_Local.pm}) {
-            die $@;
-        };
-
-
-
-
-=head1 SEE ALSO
-
-This class allows "overlay" methods to be placed
-into the following files _Overlay is for a System overlay by the original author,
-_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
-
-These overlay files can contain new subs or subs to replace existing subs in this module.
-
-Each of these files should begin with the line 
-
-   no warnings qw(redefine);
-
-so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
-
-RT::Principals_Overlay, RT::Principals_Vendor, RT::Principals_Local
-
-=cut
-
+RT::Base->_ImportOverlays();
 
 1;