[freeside-commits] freeside/httemplate/edit cgp_rule.html, 1.1.2.5, 1.1.2.6

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv28051/httemplate/edit

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cgp_rule.html 
Log Message:
mysql compat: cgp_rule_condition s/condition/conditionname/

Index: cgp_rule.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cgp_rule.html,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -w -d -r1.1.2.5 -r1.1.2.6
--- cgp_rule.html	30 Apr 2010 02:17:33 -0000	1.1.2.5
+++ cgp_rule.html	7 Jun 2010 00:09:25 -0000	1.1.2.6
@@ -51,7 +51,7 @@
 my $m2_error_callback_cond = sub {
   my($cgi, $object) = @_;
 
-  my @fields = qw( condition op params );
+  my @fields = qw( conditionname op params );
   my @gfields = ( '', map "_$_", @fields );
 
   map {
@@ -83,7 +83,7 @@
         if ( /^ruleactionnum(\d+)$/ ) {
           my $num = $1;
           if ( grep $cgi->param("ruleactionnum$num$_"), @gfields ) {
-            my $x = new FS::cgp_rule_condition {
+            my $x = new FS::cgp_rule_action {
               'ruleactionnum' => $cgi->param("ruleactionnum$num"),
               map { $_ => scalar($cgi->param("ruleactionnum${num}_$_")) } @fields,
             };