merging vpopmail support branch

[freeside.git] / httemplate / edit / part_svc.cgi

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index cc0ee6f..7fadf00 100755 (executable)
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.3 2001-08-11 23:19:09 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -6,9 +6,10 @@
        map { $_, scalar($cgi->param($_)) } fields('part_svc')
      } );
    } elsif ( $cgi->keywords ) { #edit
-     my $query = $cgi->keywords;
-     $query =~ /^(\d+)$/;
-     $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
+     my($query) = $cgi->keywords;
+     $query =~ /^(\d+)$/ or die "malformed query: $query";
+     $part_svc=qsearchs('part_svc', { 'svcpart'=>$1 } )
+       or die "unknown svcpart: $1";
    } else { #adding
      $part_svc = new FS::part_svc {};
    }
@@ -86,8 +87,11 @@ function changed(what) {
 <% } %>
 }
 </SCRIPT>
+<% my @dbs = $hashref->{svcdb}
+             ? ( $hashref->{svcdb} )
+             : qw( svc_acct svc_domain svc_acct_sm svc_www ); %>
 Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
-<% foreach my $svcdb (qw( svc_acct svc_domain svc_acct_sm svc_www )) { %>
+<% foreach my $svcdb (@dbs) { %>
 <OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
 <% } %>
 </SELECT>