From 5b48183ad64fb7ea119c994ed1a921fcda4a0f9d Mon Sep 17 00:00:00 2001 From: khoff Date: Mon, 7 Jul 2003 22:44:40 +0000 Subject: Various virtual field UI updates/bug fixes. Fixed ordered qsearches. --- httemplate/edit/part_svc.cgi | 21 ++++++++++++++------ httemplate/edit/router.cgi | 42 ++++++++++----------------------------- httemplate/edit/svc_acct.cgi | 12 +++++++++-- httemplate/edit/svc_broadband.cgi | 34 +++++++------------------------ httemplate/edit/svc_www.cgi | 12 +++++++++-- 5 files changed, 52 insertions(+), 69 deletions(-) (limited to 'httemplate/edit') diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi index d1a726fdc..45e0b6ffe 100755 --- a/httemplate/edit/part_svc.cgi +++ b/httemplate/edit/part_svc.cgi @@ -65,6 +65,9 @@ blank slipip as well as a fixed shell something like /bin/true or

<% + +my %vfields; + #these might belong somewhere else for other user interfaces #pry need to eventually create stuff that's shared amount UIs my %defs = ( @@ -130,6 +133,7 @@ my %defs = ( foreach $svcdb (keys(%defs)) { my $self = "FS::$svcdb"->new; + $vfields{$svcdb} = {}; foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them my $pvf = $self->pvf($field); my @list = $pvf->list; @@ -138,13 +142,13 @@ my %defs = ( type => 'select', select_list => \@list }; } else { - warn "$field"; $defs{$svcdb}->{$field} = $pvf->label; } #endif + $vfields{$svcdb}->{$field} = $pvf; + warn "\$vfields{$svcdb}->{$field} = $pvf"; } #next $field } #next $svcdb - - + my @dbs = $hashref->{svcdb} ? ( $hashref->{svcdb} ) : qw( svc_acct svc_domain svc_forward svc_www svc_broadband ); @@ -170,7 +174,7 @@ my %defs = ( $html .= '

'. table(). table(). "Exports"; foreach my $part_export ( @part_export ) { - $html .= 'svcpart ) #null svcpart search causing error @@ -215,8 +219,8 @@ my %defs = ( qq!Default ". qq!Fixed ". - '
'; + ' CHECKED'x($flag eq 'F'). ">Fixed "; + $html .= '
'; } if ( ref($def) ) { if ( $def->{type} eq 'select' ) { @@ -250,6 +254,11 @@ my %defs = ( $html .= qq!!; } + + if($vfields{$layer}->{$field}) { + $html .= qq!
Excluded "; + } $html .= "\n"; } $part_svc->svcpart('') if $clone; #undone diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi index b524c6494..de0fa6dbe 100755 --- a/httemplate/edit/router.cgi +++ b/httemplate/edit/router.cgi @@ -16,7 +16,6 @@ if ( $cgi->keywords ) { my $routernum = $router->routernum; my $action = $routernum ? 'Edit' : 'Add'; -my $hashref = $router->hashref; print header("$action Router", menubar( 'Main Menu' => "$p", @@ -27,11 +26,14 @@ if($cgi->param('error')) { %> Error: <%=$cgi->param('error')%> <% } %> -
+ + + + Router #<%=$routernum or "(NEW)"%> -

Name +

Name

Custom fields: @@ -39,35 +41,11 @@ Custom fields: <%=table() %> <% -# I know, I know. Massive false laziness with edit/svc_broadband.cgi. But -# Kristian won't let me generalize the custom field mechanism to every table in -# the database, so this is what we get. -# -- MW - -my @part_router_field = qsearch('part_router_field', { }); -my %rf = map { $_->part_router_field->name, $_->value } $router->router_field; -foreach (sort { $a->name cmp $b->name } @part_router_field) { - %> - - <%=$_->name%> - <% - if(my @opts = $_->list_values) { - %> - <% } else { %> - length ? 'SIZE="'.$_->length.'"' : ''%>> - <% } %> - -<% } %> +foreach my $field ($router->virtual_fields) { + print $router->pvf($field)->widget('HTML', 'edit', + $router->getfield($field)); +} +%> diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 4420bb609..44606d9a0 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -35,8 +35,6 @@ if ( $cgi->param('error') ) { } else { #adding - $svc_acct = new FS::svc_acct({}); - foreach $_ (split(/-/,$query)) { $pkgnum=$1 if /^pkgnum(\d+)$/; $svcpart=$1 if /^svcpart(\d+)$/; @@ -44,6 +42,8 @@ if ( $cgi->param('error') ) { $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } ); die "No part_svc entry for svcpart $svcpart!" unless $part_svc; + $svc_acct = new FS::svc_acct({svcpart => $svcpart}); + $svcnum=''; #set gecos @@ -281,6 +281,14 @@ if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) { } print ''; +foreach $field ($svc_acct->virtual_fields) { + if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { + # If the flag is X, it won't even show up in $svc_acct->virtual_fields. + print $svc_acct->pvf($field)->widget('HTML', 'edit', + $svc_acct->getfield($field)); + } +} + #submit print qq!
!; diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi index ee7f8becf..6828791c0 100644 --- a/httemplate/edit/svc_broadband.cgi +++ b/httemplate/edit/svc_broadband.cgi @@ -36,8 +36,6 @@ if ( $cgi->param('error') ) { } else { #adding - $svc_broadband = new FS::svc_broadband({}); - foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart $pkgnum=$1 if /^pkgnum(\d+)$/; $svcpart=$1 if /^svcpart(\d+)$/; @@ -45,7 +43,7 @@ if ( $cgi->param('error') ) { $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); die "No part_svc entry!" unless $part_svc; - $svc_broadband->setfield('svcpart', $svcpart); + $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart }); $svcnum=''; @@ -159,30 +157,12 @@ Service #<%=$svcnum ? $svcnum : "(NEW)"%>

<% } %> <% - - my @part_sb_field = qsearch('part_sb_field', { svcpart => $svcpart }); - my $sbf_hashref = $svc_broadband->sb_field_hashref($svcpart); - foreach (sort { $a->name cmp $b->name } @part_sb_field) { - %> - - <%=$_->name%> - <% - if(my @opts = $_->list_values) { - %> - - <% } else { %> - length ? 'SIZE="'.$_->length.'"' : ''%>> - <% } %> - - -<% } %> +foreach $field ($svc_broadband->virtual_fields) { + if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { + print $svc_broadband->pvf($field)->widget('HTML', 'edit', + $svc_broadband->getfield($field)); + } +} %>
diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index d2c9ade5c..043af610b 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -29,12 +29,12 @@ if ( $cgi->param('error') ) { } else { #adding - $svc_www = new FS::svc_www({}); - foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart $pkgnum=$1 if /^pkgnum(\d+)$/; $svcpart=$1 if /^svcpart(\d+)$/; } + $svc_www = new FS::svc_www { svcpart => $svcpart }; + $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); die "No part_svc entry!" unless $part_svc; @@ -167,6 +167,14 @@ foreach $_ (keys %username) { } print ""; +foreach $field ($svc_www->virtual_fields) { + if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { + # If the flag is X, it won't even show up in $svc_acct->virtual_fields. + print $svc_www->pvf($field)->widget('HTML', 'edit', + $svc_www->getfield($field)); + } +} + print '
'; print <