fix agent type selection for the simple case, RT#30942, RT#28804

4 files changed, 11 insertions, 55 deletions

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index f9d138380..9e506a731 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -322,12 +322,11 @@ Example:
 %     'layer_values'  => $layer_values,
 %     'html_between'  => $f->{'html_between'},
 %
-%     #umm.  for select-agent_types at least
+%     #umm.  for select-agent_type at least
 %     'disabled'      => $f->{'disabled'},
 %     'fixed'         => $f->{'fixed'},
-%
-%     #umm.  for select-agent_types at least
 %     'label_callback'=> $f->{'label_callback'},
+%     'element_etc'   => $f->{'element_etc'},
 %
 %     #for select-ticketing_queueid at least
 %     'post_options'  => $f->{'post_options'},
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index cc5606e54..36747783c 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -51,6 +51,7 @@
                    'credit_weight'    => 'Credit weight',
                    'agent_pkgpartid'  => 'External ID',
                    'agentnum'         => 'Agent',
+                   'agent_type'       => ' ', #just its title headingn is fine
                    'setup_fee'        => 'Setup fee',
                    'setup_show_zero'  => 'Show zero setup',
                    'recur_fee'        => 'Recurring fee',
@@ -227,9 +228,14 @@
 
                    { type => 'columnnext' },
 
-                     { field    => 'agent_type',
-                       type     => 'select-agent_types',
-                       disabled => ! $acl_edit_global,
+                     {type=>'justtitle', value=>'Agent (reseller) types' },
+
+                     { field       => 'agent_type',
+                       type        => 'select-agent_type',
+                       disabled    => ! $acl_edit_global,
+                #XXX ???  'element_name' => 'agent_type',
+                       element_etc => 'size="10"',
+                       multiple    =>  '1', #cause edit.html is dum
                        curr_value_callback => sub {
                          my($cgi, $object, $field) = @_;
                          #in the other callbacks..?  hmm.
diff --git a/httemplate/elements/select-agent_types.html b/httemplate/elements/select-agent_types.html
deleted file mode 100644
index 400b453b3..000000000
--- a/httemplate/elements/select-agent_types.html
+++ /dev/null
@@ -1,30 +0,0 @@
-%# if ( $cgi->param('clone') ) { #XXX
-% if ( $opt{'disabled'} ) { 
-
-    <INPUT TYPE="hidden" NAME="agent_type" VALUE="">
-
-% } elsif ( scalar(@all_agent_types) == 1) {
-
-    <INPUT TYPE="hidden" NAME="agent_type" VALUE="<% $all_agent_types[0] %>">
-
-% } else {
-
-    <% include( 'select-table.html',
-                  'element_name' => 'agent_type',
-                  'table'        => 'agent_type',
-                  'name_col'     => 'atype',
-                  #'value'        => \@agent_type,
-                  'element_etc'  => 'size="10"',
-                  %opt,
-                  'multiple'     =>  '1', #cause edit.html is dum
-              )
-    %>
-
-% }
-<%init>
-
-my %opt = @_;
-
-my @all_agent_types = map {$_->typenum} qsearch('agent_type',{});
-
-</%init>
diff --git a/httemplate/elements/tr-select-agent_types.html b/httemplate/elements/tr-select-agent_types.html
deleted file mode 100644
index efbf386a7..000000000
--- a/httemplate/elements/tr-select-agent_types.html
+++ /dev/null
@@ -1,19 +0,0 @@
-% unless ( $opt{'disabled'} || scalar(@all_agent_types) == 1 ) {
-
-<% include('/elements/tr-justtitle.html', value=>'Agent (reseller) types') %>
-
-% }
-
-<TR>
-  <TD COLSPAN=2>
-    <% include('select-agent_types.html', %opt) %>
-  </TD>
-</TR>
-
-<%init>
-
-my %opt = @_;
-
-my @all_agent_types = map {$_->typenum} qsearch('agent_type',{});
-
-</%init>