projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix spurious !; in customer search, RT#13966
[freeside.git]
/
httemplate
/
config
/
config.cgi
diff --git
a/httemplate/config/config.cgi
b/httemplate/config/config.cgi
index
c2b3e6d
..
040ed04
100644
(file)
--- a/
httemplate/config/config.cgi
+++ b/
httemplate/config/config.cgi
@@
-131,7
+131,11
@@
Setting <b><% $key %></b>
% } elsif ( $type eq 'select-sub' ) {
% } elsif ( $type eq 'select-sub' ) {
- <select name="<% "$key$n" %>"><option value="">
+ <select name="<% "$key$n" %>" <% $config_item->multiple ? 'MULTIPLE' : '' %>>
+
+% unless ( $config_item->multiple ) {
+ <option value="">
+% }
% my %options = &{$config_item->options_sub};
% my @options = sort { $a <=> $b } keys %options;
% my %options = &{$config_item->options_sub};
% my @options = sort { $a <=> $b } keys %options;
@@
-139,7
+143,17
@@
Setting <b><% $key %></b>
% foreach my $value ( @options ) {
% local($^W)=0; next if $saw{$value}++;
% foreach my $value ( @options ) {
% local($^W)=0; next if $saw{$value}++;
- <option value="<% $value %>" <% $value eq $conf->config($key, $agentnum) ? 'SELECTED' : '' %>><% $value %>: <% $options{$value} %>
+ <option value="<% $value %>"
+
+% if ( $value eq $conf->config($key, $agentnum)
+% || ( $config_item->multiple
+% && grep { $_ eq $value } $conf->config($key, $agentnum) ) ){
+
+ SELECTED
+
+% }
+
+ ><% $value %>: <% $options{$value} %>
% }
% my $curvalue = $conf->config($key, $agentnum);
% }
% my $curvalue = $conf->config($key, $agentnum);
@@
-271,6
+285,7
@@
Setting <b><% $key %></b>
%
% my %opt = ( 'element_name' => "$key$n",
% 'empty_label' => ' ',
%
% my %opt = ( 'element_name' => "$key$n",
% 'empty_label' => ' ',
+% 'showdisabled' => 1,
% );
% if ( $config_item->multiple ) {
% $opt{'multiple'} = 1 if $config_item->multiple;
% );
% if ( $config_item->multiple ) {
% $opt{'multiple'} = 1 if $config_item->multiple;
@@
-308,7
+323,7
@@
my @config_items = $conf->config_items;
my %confitems = map { $_->key => $_ } @config_items;
my %element_types = map { $_ => 1 } qw(
my %confitems = map { $_->key => $_ } @config_items;
my %element_types = map { $_ => 1 } qw(
- select-part_svc select-part_pkg select-pkg_class
+ select-part_svc select-part_pkg select-pkg_class
select-agent
);
</%once>
);
</%once>