show labels for select(select_hash) config options, RT#3997

[freeside.git] / httemplate / edit / elements / svc_Common.html

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 72abcba..0b64120 100644 (file)
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -1,21 +1,3 @@
-%
-%  my %opt = @_;
-%
-%  #my( $svcnum, $pkgnum, $svcpart, $part_svc );
-%  my( $pkgnum, $svcpart, $part_svc );
-%
-%  #get & untaint pkgnum & svcpart
-%  if ( ! $cgi->param('error')
-%       && $cgi->param('pkgnum') && $cgi->param('svcpart')
-%     )
-%  {
-%    $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
-%    $pkgnum = $1;
-%    $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
-%    $svcpart = $1;
-%    $cgi->delete_all(); #so edit.html treats this correctly as new??
-%  }
-%
 <% include( 'edit.html',
 
                  'menubar' => [],
@@ -28,6 +10,8 @@
 
                    $part_svc = qsearchs( 'part_svc', { svcpart=>$svcpart });
                    die "No part_svc entry!" unless $part_svc;
+
+                   $svc_x->setfield('svcpart', $svcpart);
                  },
 
                  'edit_callback' => sub {
@@ -43,7 +27,7 @@
                    die "No part_svc entry!" unless $part_svc;
                  },
 
-                 'new_hash_callback' => sub {
+                 'new_hashref_callback' => sub {
                    #my( $cgi, $svc_x ) = @_;
 
                    { svcpart => $svcpart };
@@ -63,15 +47,34 @@
                  },
 
                  'field_callback' => sub {
-                   my $f = shift;
+                   my ($cgi, $object, $f) = @_;
                    my $columndef = $part_svc->part_svc_column($f->{'field'});
                    my $flag = $columndef->columnflag;
                    if ( $flag eq 'F' ) {
-                     $f->{'type'} = 'fixed';
+                     $f->{'type'} = length($columndef->columnvalue)
+                                      ? 'fixed'
+                                      : 'hidden';
                      $f->{'value'} = $columndef->columnvalue;
                    }
                  },
 
+                 'html_init' => sub {
+                   my $cust_main;
+                   if ( $pkgnum ) {
+                     my $cust_pkg = qsearchs('cust_pkg', {'pkgnum' => $pkgnum});
+                     $cust_main = $cust_pkg->cust_main if $cust_pkg;
+                   }
+                   $cust_main
+                     ? include( '/elements/small_custview.html',
+                                $cust_main,
+                                '',
+                                1,
+                                popurl(2). "view/cust_main.cgi"
+                              ). '<BR>'
+                     : '';
+
+                 },
+
                  'html_table_bottom' => sub {
                    my $svc_x = shift;
                    my $html = '';
@@ -97,3 +100,23 @@
                  %opt #pass through/override params
              )
 %>
+<%init>
+
+my %opt = @_;
+
+#my( $svcnum, $pkgnum, $svcpart, $part_svc );
+my( $pkgnum, $svcpart, $part_svc );
+
+#get & untaint pkgnum & svcpart
+if ( ! $cgi->param('error')
+     && $cgi->param('pkgnum') && $cgi->param('svcpart')
+   )
+{
+  $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
+  $pkgnum = $1;
+  $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
+  $svcpart = $1;
+  #$cgi->delete_all(); #so edit.html treats this correctly as new??
+}
+
+</%init>