diff --git a/doc/API/API-Docs.md b/doc/API/API-Docs.md index 2313cc0395..1dd4b3493d 100644 --- a/doc/API/API-Docs.md +++ b/doc/API/API-Docs.md @@ -1158,7 +1158,7 @@ Route: /api/v0/devicegroups/:name Input (JSON): - -full: set to true to return all columns for the devices in a group + - full: set to any value to return all data for the devices in a given group Examples: ```curl diff --git a/html/includes/api_functions.inc.php b/html/includes/api_functions.inc.php index 3898ef239f..c1f7aba383 100644 --- a/html/includes/api_functions.inc.php +++ b/html/includes/api_functions.inc.php @@ -1405,7 +1405,6 @@ function get_devices_by_group() 'devices' => $devices, ); - logfile(var_dump($output)); $app->response->setStatus($code); $app->response->headers->set('Content-Type', 'application/json'); echo _json_encode($output); diff --git a/includes/device-groups.inc.php b/includes/device-groups.inc.php index 3b314659bb..a2f4230a14 100644 --- a/includes/device-groups.inc.php +++ b/includes/device-groups.inc.php @@ -188,15 +188,15 @@ function QueryDevicesFromGroup($group_id) * Get an array of all the device ids belonging to this group_id * @param $group_id * @param bool $nested Return an array of arrays containing 'device_id'. (for API compatibility) - * @param bool $full Return all fields from devices_id + * @param string $full Return all fields from devices_id * @return array */ -function GetDevicesFromGroup($group_id, $nested = false, $full = false) +function GetDevicesFromGroup($group_id, $nested = false, $full = '') { if ($full) { - $query = 'SELECT `device_groups`.`name`, `devices`.* FROM `device_groups` INNER JOIN `device_group_device` ON `device_groups`.`id` = `device_group_device`.`device_group_id` INNER JOIN `devices` ON `device_group_device`.`device_id` = `devices`.`device_id` WHERE `device_groups`.`id`=?'; + $query = 'SELECT `device_groups`.`name`, `devices`.* FROM `device_groups` INNER JOIN `device_group_device` ON `device_groups`.`id` = `device_group_device`.`device_group_id` INNER JOIN `devices` ON `device_group_device`.`device_id` = `devices`.`device_id` WHERE `device_groups`.`id` = ?'; } else { - $query = 'SELECT `device_id` FROM `device_group_device` WHERE `device_group_id`=?'; + $query = 'SELECT `device_id` FROM `device_group_device` WHERE `device_group_id` = ? '; } if ($nested) { return dbFetchRows($query, array($group_id));