[freeside-commits] freeside/httemplate/elements select-cgp_rule_condition.html, 1.1.2.5, 1.1.2.6

[Ivan,,,]

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

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

Index: select-cgp_rule_condition.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-cgp_rule_condition.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
--- select-cgp_rule_condition.html	30 Apr 2010 02:17:33 -0000	1.1.2.5
+++ select-cgp_rule_condition.html	7 Jun 2010 00:09:19 -0000	1.1.2.6
@@ -3,10 +3,10 @@
   <INPUT TYPE="hidden" NAME="<%$name%>" ID="<%$id%>" VALUE="<% $curr_value %>">
 
   <% include( 'select.html',
-                'field'      => $name.'_condition',
-                'id'         => $id.'_condition',
+                'field'      => $name.'_conditionname',
+                'id'         => $id.'_conditionname',
                 'options'    => \@conditions,
-                'curr_value' => $condition,
+                'curr_value' => $conditionname,
                 'labels'     => { '' => 'Select Condition' },
                 'onchange'   => $name.'_changed',
             )
@@ -189,10 +189,10 @@
   $cgp_rule_condition = new FS::cgp_rule_condition {};
 }
 
-my $condition = scalar($cgi->param($name.'_condition'))
-                || $cgp_rule_condition->condition;
+my $conditionname = scalar($cgi->param($name.'_conditionname'))
+                    || $cgp_rule_condition->conditionname;
 
-my @op = &$cond2op($condition);
+my @op = &$cond2op($conditionname);
 
 my $disabled = scalar(@op) ? '' : 1;
 my $style = $disabled ? 'visibility:hidden' : '';