From 64679ee72e477d414ff0dad57aab425eacbccbf2 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Thu, 21 Feb 2019 18:00:50 +0100 Subject: [PATCH] discovery minor fixes Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8 --- pandora_console/godmode/servers/discovery.php | 5 ++++- .../wizards/DiscoveryTaskList.class.php | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pandora_console/godmode/servers/discovery.php b/pandora_console/godmode/servers/discovery.php index 261cdd0696..d7ee26de86 100755 --- a/pandora_console/godmode/servers/discovery.php +++ b/pandora_console/godmode/servers/discovery.php @@ -134,7 +134,10 @@ if ($classname_selected !== null) { ui_print_error_message($result['msg']); } - $classname_selected = null; + // Redirect to Tasklist. + $classname_selected = 'DiscoveryTaskList'; + $wiz = new $classname_selected($page); + $result = $wiz->run(); } } diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index e075bb4f9e..179d87b2a6 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -125,17 +125,23 @@ class DiscoveryTaskList extends Wizard $task = get_parameter('task', null); if ($task !== null) { - db_process_sql_delete( + $result = db_process_sql_delete( 'trecon_task', ['id_rt' => $task] ); + + if ($result == 1) { + return [ + 'result' => 0, + 'msg' => __('Task successfully deleted'), + 'id' => false, + ]; + } + + // Trick to avoid double execution. + header('Location: '.$this->url); } - return [ - 'result' => 0, - 'msg' => __('Task successfully deleted'), - 'id' => false, - ]; }