[freeside-commits] freeside/FS/FS cgp_rule_action.pm, 1.1.2.2, 1.1.2.3 cgp_rule_condition.pm, 1.1.2.2, 1.1.2.3 Schema.pm, 1.168.2.36, 1.168.2.37 Mason.pm, 1.19.2.6, 1.19.2.7

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	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.168.2.36
retrieving revision 1.168.2.37
diff -u -w -d -r1.168.2.36 -r1.168.2.37
--- Schema.pm	23 Apr 2010 06:45:54 -0000	1.168.2.36
+++ Schema.pm	30 Apr 2010 02:17:32 -0000	1.168.2.37
@@ -1638,8 +1638,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',
@@ -1651,7 +1651,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.1.2.2
retrieving revision 1.1.2.3
diff -u -w -d -r1.1.2.2 -r1.1.2.3
--- cgp_rule_action.pm	23 Apr 2010 06:43:40 -0000	1.1.2.2
+++ cgp_rule_action.pm	30 Apr 2010 02:17:32 -0000	1.1.2.3
@@ -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.19.2.6
retrieving revision 1.19.2.7
diff -u -w -d -r1.19.2.6 -r1.19.2.7
--- Mason.pm	23 Apr 2010 06:43:40 -0000	1.19.2.6
+++ Mason.pm	30 Apr 2010 02:17:32 -0000	1.19.2.7
@@ -224,6 +224,8 @@
   use FS::svc_pbx;
   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.1.2.2
retrieving revision 1.1.2.3
diff -u -w -d -r1.1.2.2 -r1.1.2.3
--- cgp_rule_condition.pm	23 Apr 2010 06:43:40 -0000	1.1.2.2
+++ cgp_rule_condition.pm	30 Apr 2010 02:17:32 -0000	1.1.2.3
@@ -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;