clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 10:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

some small updates (#6022)

Browse Source
This commit is contained in:
Neil Lathwood 2017-02-27 14:39:02 +00:00 committed by GitHub
parent 698584e14d
commit bbc7d71cf9
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/API/API-Docs.md
View File

@ -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

1
html/includes/api_functions.inc.php
View File

@ -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);

8
includes/device-groups.inc.php
View File

@ -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));