[freeside-commits] freeside/FS/FS cgp_rule_action.pm, 1.3, 1.4 cgp_rule_condition.pm, 1.3, 1.4 Schema.pm, 1.214, 1.215 Mason.pm, 1.34, 1.35

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv19603/FS/FS

Modified Files:
	cgp_rule_action.pm cgp_rule_condition.pm Schema.pm Mason.pm 
Log Message:
communigate (phase 2): rules: show conditions/actions on rule browse, fix rule edit for conditions and actions without op/param, fix rule edit stickiness on errors.  RT#7514

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -w -d -r1.214 -r1.215
--- Schema.pm	27 Apr 2010 05:38:27 -0000	1.214
+++ Schema.pm	30 Apr 2010 02:32:38 -0000	1.215
@@ -1803,8 +1803,8 @@
       'columns' => [
         'ruleconditionnum',  'serial', '',      '', '', '',
         'condition',        'varchar', '', $char_d, '', '',
-        'op',               'varchar', '', $char_d, '', '',
-        'params',           'varchar', '',     255, '', '',
+        'op',               'varchar', 'NULL', $char_d, '', '',
+        'params',           'varchar', 'NULL',     255, '', '',
         'rulenum',              'int', '',      '', '', '',
       ],
       'primary_key' => 'ruleconditionnum',
@@ -1816,7 +1816,7 @@
        'columns' => [
         'ruleactionnum',  'serial', '',      '', '', '',
         'action',        'varchar', '', $char_d, '', '',
-        'params',        'varchar', '',     255, '', '',
+        'params',        'varchar', 'NULL',     255, '', '',
         'rulenum',           'int', '',      '', '', '',
       ],
       'primary_key' => 'ruleactionnum',

Index: cgp_rule_action.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cgp_rule_action.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- cgp_rule_action.pm	23 Apr 2010 06:43:39 -0000	1.3
+++ cgp_rule_action.pm	30 Apr 2010 02:32:38 -0000	1.4
@@ -111,7 +111,7 @@
   my $error = 
     $self->ut_numbern('ruleactionnum')
     || $self->ut_text('action')
-    || $self->ut_text('params')
+    || $self->ut_textn('params')
     || $self->ut_foreign_key('rulenum', 'cgp_rule', 'rulenum')
   ;
   return $error if $error;

Index: Mason.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -w -d -r1.34 -r1.35
--- Mason.pm	23 Apr 2010 06:43:39 -0000	1.34
+++ Mason.pm	30 Apr 2010 02:32:38 -0000	1.35
@@ -235,6 +235,8 @@
   use FS::cust_bill_pkg_discount;
   use FS::svc_mailinglist;
   use FS::cgp_rule;
+  use FS::cgp_rule_condition;
+  use FS::cgp_rule_action;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {

Index: cgp_rule_condition.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cgp_rule_condition.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- cgp_rule_condition.pm	23 Apr 2010 06:43:39 -0000	1.3
+++ cgp_rule_condition.pm	30 Apr 2010 02:32:38 -0000	1.4
@@ -115,8 +115,8 @@
   my $error = 
     $self->ut_numbern('ruleconditionnum')
     || $self->ut_text('condition')
-    || $self->ut_text('op')
-    || $self->ut_text('params')
+    || $self->ut_textn('op')
+    || $self->ut_textn('params')
     || $self->ut_foreign_key('rulenum', 'cgp_rule', 'rulenum')
   ;
   return $error if $error;