From: ivan <ivan>
Date: Mon, 24 Jan 2011 02:59:48 +0000 (+0000)
Subject: torrus, RT#10574
X-Git-Tag: freeside_2_3_0~697
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=407fe3e7c401c7d2a7d6c3d9a0b22415a6d0a095

torrus, RT#10574
---

diff --git a/httemplate/elements/select-torrus_serviceid.html b/httemplate/elements/select-torrus_serviceid.html
index a8cfca8b8..34e8e930f 100644
--- a/httemplate/elements/select-torrus_serviceid.html
+++ b/httemplate/elements/select-torrus_serviceid.html
@@ -5,7 +5,9 @@
 % }
 
 % foreach my $serviceid ( keys %serviceid ) {
-    <OPTION VALUE="<%$serviceid%>"><% $serviceid %></OPTION>
+    <OPTION VALUE="<%$serviceid%>"
+            <% $serviceid eq $value ? 'SELECTED' : '' %>
+    ><% $serviceid %></OPTION>
 % } 
 
 </SELECT>
@@ -14,6 +16,8 @@
 
 my %opt = @_;
 
+my $value = $opt{'curr_value'} || $opt{'value'};
+
 #is this going to get too slow or will the index make it okay?
 my $sth = dbh->prepare("SELECT DISTINCT(serviceid) FROM srvexport")
   or die dbh->errstr;
diff --git a/httemplate/elements/tr-select-torrus_serviceid.html b/httemplate/elements/tr-select-torrus_serviceid.html
new file mode 100644
index 000000000..32eb6f77e
--- /dev/null
+++ b/httemplate/elements/tr-select-torrus_serviceid.html
@@ -0,0 +1,10 @@
+<TR>
+  <TD ALIGN="right"><% $opt{'label'} || 'Torrus serviceid' %></TD>
+  <TD><% include('select-torrus_serviceid.html', %opt) %></TD>
+</TR>
+
+<%init>
+
+my %opt = @_;
+
+</%init>