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

Corrected active_count for Alert icon color (#9933)

Browse Source 
* Corrected active_count for Alert icon color

* Corrected active_count for Alert icon color

* Corrected active_count for Alert icon color

* Laravel version

* Laravel version check status worse and better for isActive

* cleanup
This commit is contained in:
PipoCanaja
2019-03-14 03:01:30 +01:00
committed by Tony Murray
parent 19612cf38d
commit 787a8fc309
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/AlertRule.php
View File

@@ -39,7 +39,7 @@ class AlertRule extends BaseModel
*/
public function scopeEnabled($query)
{
return $query->where('disabled', 0);
return $query->where('alert_rules.disabled', 0);
}
/**
@@ -52,7 +52,7 @@ class AlertRule extends BaseModel
{
return $query->enabled()
->join('alerts', 'alerts.rule_id', 'alert_rules.id')
->where('alerts.state', 1);
->whereNotIn('alerts.state', [0, 2]);
}
/**