X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FCondition.pm;h=537aa541be8bdcf5118290ffae15898bff54bbfd;hp=2774fe823377be1b8e6fd806c85f5a9219d34549;hb=7322f2afedcc2f427e997d1535a503613a83f088;hpb=01352af8e44b7eb70b2b587ca43ab7ca946f038d

diff --git a/rt/lib/RT/Condition.pm b/rt/lib/RT/Condition.pm
index 2774fe823..537aa541b 100755
--- a/rt/lib/RT/Condition.pm
+++ b/rt/lib/RT/Condition.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -54,14 +54,14 @@
 
     use RT::Condition;
     my $foo = RT::Condition->new( 
-		TransactionObj => $tr, 
-		TicketObj => $ti, 
-		ScripObj => $scr, 
-		Argument => $arg, 
-		Type => $type);
+                TransactionObj => $tr, 
+                TicketObj => $ti, 
+                ScripObj => $scr, 
+                Argument => $arg, 
+                Type => $type);
 
     if ($foo->IsApplicable) {
- 	   # do something
+           # do something
     }
 
 
@@ -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,20 +91,18 @@ sub new  {
   $self->_Init(@_);
   return $self;
 }
-# }}}
 
-# {{{ sub _Init 
 sub _Init  {
   my $self = shift;
   my %args = ( TransactionObj => undef,
-	       TicketObj => undef,
-	       ScripObj => undef,
-	       TemplateObj => undef,
-	       Argument => undef,
-	       ApplicableTransTypes => undef,
+               TicketObj => undef,
+               ScripObj => undef,
+               TemplateObj => undef,
+               Argument => undef,
+               ApplicableTransTypes => undef,
            CurrentUser => undef,
-	       @_ );
-  
+               @_ );
+
   $self->{'Argument'} = $args{'Argument'};
   $self->{'ScripObj'} = $args{'ScripObj'};
   $self->{'TicketObj'} = $args{'TicketObj'};
@@ -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,39 +178,21 @@ 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 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
 sub DESTROY {
     my $self = shift;
 
@@ -236,11 +205,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;