X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FCondition.pm;h=2aa6545aaaea11ab653ef4b7eb613950879203c3;hb=31f3763747b82764bb019cfab5b2a2945fc9a99d;hp=be7c4c56d191d25e2c2476540c131b23d851c9fd;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/rt/lib/RT/Condition.pm b/rt/lib/RT/Condition.pm
index be7c4c56d..2aa6545aa 100755
--- a/rt/lib/RT/Condition.pm
+++ b/rt/lib/RT/Condition.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-2015 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,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
@@ -80,9 +80,9 @@ package RT::Condition;
 use strict;
 use warnings;
 
+
 use base qw/RT::Base/;
 
-# {{{ sub new 
 sub new  {
   my $proto = shift;
   my $class = ref($proto) || $proto;
@@ -91,9 +91,7 @@ sub new  {
   $self->_Init(@_);
   return $self;
 }
-# }}}
 
-# {{{ sub _Init 
 sub _Init  {
   my $self = shift;
   my %args = ( TransactionObj => undef,
@@ -112,11 +110,9 @@ sub _Init  {
   $self->{'ApplicableTransTypes'} = $args{'ApplicableTransTypes'};
   $self->CurrentUser($args{'CurrentUser'});
 }
-# }}}
 
 # Access Scripwide data
 
-# {{{ sub Argument 
 
 =head2 Argument
 
@@ -128,9 +124,7 @@ sub Argument  {
   my $self = shift;
   return($self->{'Argument'});
 }
-# }}}
 
-# {{{ sub TicketObj
 
 =head2 TicketObj
 
@@ -142,9 +136,7 @@ sub TicketObj  {
   my $self = shift;
   return($self->{'TicketObj'});
 }
-# }}}
 
-# {{{ sub ScripObj
 
 =head2 ScripObj
 
@@ -156,8 +148,6 @@ sub ScripObj  {
   my $self = shift;
   return($self->{'ScripObj'});
 }
-# }}}
-# {{{ sub TransactionObj
 
 =head2 TransactionObj
 
@@ -169,9 +159,7 @@ sub TransactionObj  {
   my $self = shift;
   return($self->{'TransactionObj'});
 }
-# }}}
 
-# {{{ sub Type
 
 =head2 Type 
 
@@ -183,7 +171,6 @@ sub ApplicableTransTypes  {
   my $self = shift;
   return($self->{'ApplicableTransTypes'});
 }
-# }}}
 
 
 # Scrip methods
@@ -191,26 +178,34 @@ sub ApplicableTransTypes  {
 
 #What does this type of Action does
 
-# {{{ sub Describe 
 sub Describe  {
   my $self = shift;
   return ($self->loc("No description for [_1]", ref $self));
 }
-# }}}
 
 
 #Parse the templates, get things ready to go.
 
 #If this rule applies to this transaction, return true.
 
-# {{{ sub IsApplicable 
 sub IsApplicable  {
   my $self = shift;
   return(undef);
 }
-# }}}
 
-# {{{ sub DESTROY
+sub Options {
+  my $self = shift;
+  return();
+}
+
+sub Rules {
+  my $self = shift;
+  return () if !$self->ScripObj or !$self->ScripObj->ConditionRules;
+  # By default, option names and values are on consecutive lines.
+  # Override this if you need anything more interesting.
+  return(split "\n", $self->ScripObj->ConditionRules);
+}
+
 sub DESTROY {
     my $self = shift;
 
@@ -223,11 +218,7 @@ sub DESTROY {
      
 }
 
-# }}}
 
-eval "require RT::Condition_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition_Vendor.pm});
-eval "require RT::Condition_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Condition_Local.pm});
+RT::Base->_ImportOverlays();
 
 1;