mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression after fc281ccc4b (#10505)

Browse Source
This commit is contained in:
Jellyfrog
2019-08-08 13:44:42 +02:00
committed by Tony Murray
parent 9dfae2ff14
commit 988dd9b615
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Device.php
View File

@@ -431,7 +431,7 @@ class Device extends BaseModel
public function scopeInDeviceGroup($query, $deviceGroup) public function scopeInDeviceGroup($query, $deviceGroup)
{ {
return $query->whereIn('device_id', function ($query) use ($deviceGroup) { return $query->whereIn($query->qualifyColumn('device_id'), function ($query) use ($deviceGroup) {
$query->select('device_id') $query->select('device_id')
->from('device_group_device') ->from('device_group_device')
->where('device_group_id', $deviceGroup); ->where('device_group_id', $deviceGroup);

2
app/Models/DeviceRelatedModel.php
View File

@@ -36,7 +36,7 @@ class DeviceRelatedModel extends BaseModel
public function scopeInDeviceGroup($query, $deviceGroup) public function scopeInDeviceGroup($query, $deviceGroup)
{ {
return $query->whereIn('device_id', function ($query) use ($deviceGroup) { return $query->whereIn($query->qualifyColumn('device_id'), function ($query) use ($deviceGroup) {
$query->select('device_id') $query->select('device_id')
->from('device_group_device') ->from('device_group_device')
->where('device_group_id', $deviceGroup); ->where('device_group_id', $deviceGroup);