default to a session cookie instead of setting an explicit timeout, weird timezone...

[freeside.git] / httemplate / edit / cgp_rule.html

diff --git a/httemplate/edit/cgp_rule.html b/httemplate/edit/cgp_rule.html
index d9c19a1..1f838e2 100644 (file)
--- a/httemplate/edit/cgp_rule.html
+++ b/httemplate/edit/cgp_rule.html
@@ -51,7 +51,7 @@ my %opt = @_;
 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 {
@@ -59,7 +59,7 @@ my $m2_error_callback_cond = sub {
           my $num = $1;
           if ( grep $cgi->param("ruleconditionnum$num$_"), @gfields ) {
             my $x = new FS::cgp_rule_condition {
-              'ruleconditionnum' => $cgi->param("ruleconditionnum$num"),
+              'ruleconditionnum' => scalar($cgi->param("ruleconditionnum$num")),
               map { $_ => scalar($cgi->param("ruleconditionnum${num}_$_")) } @fields,
             };
             $x;
@@ -83,8 +83,8 @@ my $m2_error_callback_action = sub {
         if ( /^ruleactionnum(\d+)$/ ) {
           my $num = $1;
           if ( grep $cgi->param("ruleactionnum$num$_"), @gfields ) {
-            my $x = new FS::cgp_rule_condition {
-              'ruleactionnum' => $cgi->param("ruleactionnum$num"),
+            my $x = new FS::cgp_rule_action {
+              'ruleactionnum' => scalar($cgi->param("ruleactionnum$num")),
               map { $_ => scalar($cgi->param("ruleactionnum${num}_$_")) } @fields,
             };
             $x;