From: ivan <ivan>
Date: Fri, 18 Sep 2009 22:35:29 +0000 (+0000)
Subject: fix customer and package status conditions not sticky on edit, noticed on RT#6150
X-Git-Tag: root_of_svc_elec_features~853
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=5ea78c9342c376406271472cee971aa971c4a696;p=freeside.git

fix customer and package status conditions not sticky on edit, noticed on RT#6150
---

diff --git a/httemplate/elements/select-cust_main-status.html b/httemplate/elements/select-cust_main-status.html
index 2e0b6cb24..bdbaac7f4 100644
--- a/httemplate/elements/select-cust_main-status.html
+++ b/httemplate/elements/select-cust_main-status.html
@@ -8,7 +8,9 @@
 % foreach my $option ( @{ $opt{'statuses'} } ) { 
 
     <OPTION VALUE="<% $option %>"
-            <% $option eq $curr_value ? 'SELECTED' : '' %>
+            <% ref($value) && $value->{$option} || $option eq $value
+               ? 'SELECTED' : ''
+            %>
     ><% $option %>
 
 % } 
@@ -25,6 +27,7 @@ my $onchange = $opt{'onchange'}
                  ? 'onChange="'. $opt{'onchange'}. '(this)"'
                  : '';
 
-my $curr_value = $opt{'curr_value'} || $opt{'value'};
+my $value = $opt{'curr_value'} || $opt{'value'};
+$value = [ split(/\s*,\s*/, $value) ] if $opt{'multiple'} && $value =~ /,/;
 
 </%init>
diff --git a/httemplate/elements/select-cust_pkg-status.html b/httemplate/elements/select-cust_pkg-status.html
index 2d545c047..ec37eaf67 100644
--- a/httemplate/elements/select-cust_pkg-status.html
+++ b/httemplate/elements/select-cust_pkg-status.html
@@ -8,7 +8,9 @@
 % foreach my $option ( @{ $opt{'statuses'} } ) { 
 
     <OPTION VALUE="<% $option %>"
-            <% $option eq $curr_value ? 'SELECTED' : '' %>
+            <% ref($value) && $value->{$option} || $option eq $value
+               ? 'SELECTED' : ''
+            %>
     ><% $option %>
 
 % } 
@@ -25,6 +27,7 @@ my $onchange = $opt{'onchange'}
                  ? 'onChange="'. $opt{'onchange'}. '(this)"'
                  : '';
 
-my $curr_value = $opt{'curr_value'} || $opt{'value'};
+my $value = $opt{'curr_value'} || $opt{'value'};
+$value = [ split(/\s*,\s*/, $value) ] if $opt{'multiple'} && $value =~ /,/;
 
 </%init>