diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/config/config-delete.cgi | 4 | ||||
| -rw-r--r-- | httemplate/config/config-view.cgi | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/httemplate/config/config-delete.cgi b/httemplate/config/config-delete.cgi index ffeae7877..a05cb1e14 100644 --- a/httemplate/config/config-delete.cgi +++ b/httemplate/config/config-delete.cgi @@ -10,8 +10,10 @@ die "Configuration not found!" unless $conf; $conf->delete; my $redirect = popurl(2); -if ( $cgi->param('redirect') eq 'config_view' ) { +if ( $cgi->param('redirect') eq 'config_view_showagent' ) { $redirect .= 'config/config-view.cgi?showagent=1#'. $conf->name; +} elsif ( $cgi->param('redirect') eq 'config_view' ) { + $redirect .= 'config/config-view.cgi'; } else { $redirect .= 'browse/agent.cgi'; } diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi index aca37f2ad..9b5b13251 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -97,7 +97,16 @@ Click on a configuration value to change it. ) %>: <% $i->description %> % if ( $agent && $cgi->param('showagent') ) { - (<A HREF="javascript:areyousure('delete this agent override', 'config-delete.cgi?confnum=<% _config_agentonly($conf, $i->key, $agent->agentnum)->confnum %>;redirect=config_view')">delete agent override</A>) +% my $confnum = +% _config_agentonly($conf, $i->key, $agent->agentnum)->confnum; + (<A HREF="javascript:areyousure('delete this agent override', 'config-delete.cgi?confnum=<% $confnum %>;redirect=config_view_showagent')">delete agent override</A>) +% } elsif ( $i->base_key ) { +% my $confnum = +% $agent +% ? _config_agentonly($conf, $i->key, $agent->agentnum)->confnum +% : $conf->_config( $i->key )->confnum; +% my $showagent = $cgi->param('showagent') ? '_showagent' : ''; + (<A HREF="javascript:areyousure('delete this configuration item', 'config-delete.cgi?confnum=<% $confnum %>;redirect=config_view<%$showagent%>')">delete configuration item</A>) % } </td> @@ -308,7 +317,6 @@ if ($cgi->param('agentnum') =~ /^(\d+)$/) { my $conf = new FS::Conf; my @config_items = grep { $page_agent ? $_->per_agent : 1 } - grep { $_->key != ~/^invoice_(html|latex|template)/ } $conf->config_items; my @sections = qw(required billing username password UI session shell BIND ); |