finish up useful agent stuff on the config editor: adding, deleting overrides too. also add a confirmation to override deletion from the agent browse page. RT#5218

1 files changed, 9 insertions, 4 deletions

diff --git a/httemplate/config/config-delete.cgi b/httemplate/config/config-delete.cgi
index cdac434fa..ffeae7877 100644
--- a/httemplate/config/config-delete.cgi
+++ b/httemplate/config/config-delete.cgi
@@ -2,14 +2,19 @@
 die "access denied\n"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-die "No configuration item specified (bad URL)!" unless $cgi->keywords;
-my ($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
+$cgi->param('confnum') =~ /^(\d+)$/ or die "illegal or missing confnum";
 my $confnum = $1;
 
 my $conf = qsearchs('conf', {'confnum' => $confnum});
 die "Configuration not found!" unless $conf;
 $conf->delete;
 
+my $redirect = popurl(2);
+if ( $cgi->param('redirect') eq 'config_view' ) {
+  $redirect .= 'config/config-view.cgi?showagent=1#'. $conf->name;
+} else {
+  $redirect .= 'browse/agent.cgi';
+}
+
 </%init>
-<% $cgi->redirect(popurl(2) . "browse/agent.cgi") %>
+<% $cgi->redirect($redirect) %>