tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2294-requisitos-api-cluster' into 'develop' 

Minor fixes in api responses

See merge request artica/pandorafms!1560
This commit is contained in:
nramon 2018-06-20 13:03:11 +02:00
parent 5efc2d220e d0796a3e09
commit cf38c82653
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_api.php
View File

@ -11146,11 +11146,10 @@ function api_set_delete_cluster($id, $thrash1, $thrast2, $thrash3) {
$tcluster_delete = db_process_sql('delete from tcluster where id = '.$id); $tcluster_delete = db_process_sql('delete from tcluster where id = '.$id);
$tcluster_agent_delete = agents_delete_agent($temp_id_cluster[0]['id_agent']); $tcluster_agent_delete = agents_delete_agent($temp_id_cluster[0]['id_agent']);
if (!$tcluster_modules_delete || !$tcluster_items_delete || !$tcluster_agents_delete || !$tcluster_delete || !$tcluster_agent_delete) if (($tcluster_modules_delete + $tcluster_items_delete + $tcluster_agents_delete + $tcluster_delete + $tcluster_agent_delete) == 0)
returnError('error_delete', 'Error in delete operation.'); returnError('error_delete', 'Error in delete operation.');
else else
returnData('string', array('type' => 'string', 'data' => __('Correct Delete'))); returnData('string', array('type' => 'string', 'data' => __('Successfully deleted')));
} }
function api_set_delete_cluster_agents($thrash1, $thrast2, $other, $thrash3) { function api_set_delete_cluster_agents($thrash1, $thrast2, $other, $thrash3) {
@ -11464,7 +11463,7 @@ function api_get_agents_id_name_by_cluster_name($cluster_name, $trash1, $trash2,
return; return;
} }
$all_agents = cluster_get_agents_id_name_by_cluster_id($cluster_name); $all_agents = cluster_get_agents_id_name_by_cluster_id($value);
if (count($all_agents) > 0 and $all_agents !== false) { if (count($all_agents) > 0 and $all_agents !== false) {
$data = array('type' => 'json', 'data' => $all_agents); $data = array('type' => 'json', 'data' => $all_agents);