X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fconfig%2Fconfig-view.cgi;h=13286cf212d9f5f850752f1ac2a20e95684d84d2;hb=89e3b22429fb7c216a6f4755002bf50677dd9e97;hp=aca37f2ad710d7b2f6427483c18184734e50c7f0;hpb=b19bf30f0d745d20e5e4f0a8e47ce16a04b02dd9;p=freeside.git diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi index aca37f2ad..13286cf21 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -48,7 +48,8 @@ Click on a configuration value to change it. % foreach my $i (@{ $section_items{$section} }) { % my @types = ref($i->type) ? @{$i->type} : ($i->type); -% my( $width, $height ) = ( 522, 336 ); +%# my( $width, $height ) = ( 522, 336 ); +% my( $width, $height ) = ( 600, 336 ); % if ( grep $_ eq 'textarea', @types ) { % #800x600 % $width = 763; @@ -66,7 +67,7 @@ Click on a configuration value to change it. % @agents = ( '' ); % if ( $i->per_agent ) { % foreach my $agent (@all_agents) { -% if ( defined(_config_agentonly($conf, $i->key, $agent->agentnum)) ) { +% if ( defined($conf->conf( $i->key, $agent->agentnum, 1 ) ) ) { % push @agents, $agent; % } else { % push @add_agents, $agent; @@ -78,6 +79,8 @@ Click on a configuration value to change it. % foreach my $agent ( @agents ) { % my $agentnum = $agent ? $agent->agentnum : ''; % +% next if $section eq 'deprecated' && ! $conf->exists($i->key, $agentnum); +% % my $label = $i->key; % $label = '['. $agent->agent. "] $label" % if $agent && $cgi->param('showagent'); @@ -97,7 +100,16 @@ Click on a configuration value to change it. ) %>: <% $i->description %> % if ( $agent && $cgi->param('showagent') ) { - (delete agent override) +% my $confnum = $conf->conf( $i->key, $agent->agentnum, 1 )->confnum; + (delete agent override) +% } elsif ( $i->base_key +% || ( $deleteable{$i->key} && $conf->exists($i->key) ) ) { +% my $confnum = +% $agent +% ? $conf->conf( $i->key, $agent->agentnum, 1 )->confnum +% : $conf->conf( $i->key )->confnum; +% my $showagent = $cgi->param('showagent') ? '_showagent' : ''; + (delete configuration item) % } @@ -145,7 +157,9 @@ Click on a configuration value to change it. % } elsif ( $type eq 'textarea' % || $type eq 'editlist' -% || $type eq 'selectmultiple' ) { +% || $type eq 'selectmultiple' +% ) +% {