X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=c1f74551dc97ea46143bff31eff2b8281a22f263;hb=e710e07e4451b7c615fb477799dc64bf3490248c;hp=1271237dfb69d9e00013124f863c967ffeb5b187;hpb=9324c64e784a866c4d615773c8ce5970cc0d6ed8;p=freeside.git
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 1271237df..c1f74551d 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -97,7 +97,7 @@ function randomPass() {
% if ( $domsvc ) {
% my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $domsvc, } );
% if ( $svc_domain ) {
-% $svc_domain{$svc_domain->svcnum} = $svc_domain;
+% $svc_domain{$svc_domain->svcnum} = $svc_domain->domain;
% } else {
% warn "unknown svc_domain.svcnum for svc_acct.domsvc: $domsvc";
% }
@@ -160,6 +160,25 @@ function randomPass() {
<% FS::svc_acct_pop::popselector($popnum) %>
% }
+
+%#tower (huh)
+%if ( $conf->exists('svc_acct-tower_sector')
+% && $part_svc->part_svc_column('sectornum')->columnflag ne 'F' ) {
+ <& /elements/tr-select-tower_sector.html,
+ 'curr_value' => $svc_acct->sectornum,
+ #'part_svc' => $part_svc,
+ #'cust_pkg' => $cust_pkg,
+ &>
+%} else {
+
+%}
+
+<& /elements/tr-svc_export_machine.html,
+ 'svc' => $svc_acct,
+ 'part_svc' => $part_svc,
+ 'cgi' => $cgi,
+&>
+
% #uid/gid
% foreach my $xid (qw( uid gid )) {
%
@@ -257,14 +276,26 @@ function randomPass() {
'communigate' => $communigate,
&>
-% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) {
-
-% } else {
-
- <% mt('IP') |h %>
-
-
-% }
+% if ( $conf->exists('svc_acct-ip_addr') ) {
+% # router/block selection UI
+% # (should we show this if slipip is fixed?)
+<& /elements/tr-select-router_block_ip.html,
+ 'object' => $svc_acct,
+ 'ip_field' => 'slipip'
+&>
+% } else {
+% # don't expose these to the user--they're only useful in the other case
+
+
+% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) {
+
+% } else {
+
+ <% mt('IP') |h %>
+
+
+% }
+% }
% my %label = ( seconds => 'Time',
% upbytes => 'Upload bytes',
@@ -312,7 +343,7 @@ function randomPass() {
% } else {
% my $radius_group_selected = '';
% if ( $svc_acct->svcnum ) {
-% $radius_group_selected = join(',',$svc_acct->radius_groups('NUMBERS'));
+% $radius_group_selected = join(',',$svc_acct->radius_groups('groupnum'));
% }
% elsif ( !$svc_acct->svcnum && $part_svc_usergroup->columnflag eq 'D' ) {
% $radius_group_selected = $part_svc_usergroup->columnvalue;
@@ -320,6 +351,7 @@ function randomPass() {
<& /elements/select-radius_group.html,
curr_value => $radius_group_selected,
element_name => 'radius_usergroup',
+ multiple => 1,
&>
% }
@@ -452,10 +484,10 @@ my $part_svc_usergroup = $part_svc->part_svc_column('usergroup');
my @groupnames; # only used for display of Fixed RADIUS groups
if ( $part_svc_usergroup->columnflag eq 'F' ) {
@groups = split(',',$part_svc_usergroup->columnvalue);
- @groupnames = map { $_->description . " (" . $_->groupname . ")" }
+ @groupnames = map { $_->long_description }
qsearch({ 'table' => 'radius_group',
'extra_sql' => "where groupnum in (".$part_svc_usergroup->columnvalue.")",
- });
+ }) if length($part_svc_usergroup->columnvalue);
}
my $action = $svcnum ? 'Edit' : 'Add';