Support of "disable alerting" in availability map and device summary widget (#11022)

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* merge for last release

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Hide disabled alerting device from avaibility map

* Widget device summary

* Widget device summary

* Widget device summary

* Widget device summary

* Widget device summary

* Widget device summary

* fix color in widget device summary

* fix color in widget device summary

* Commit to restart travis CI

* Commit to restart travis CI
This commit is contained in:
louis-oui
2020-01-15 18:32:29 +01:00
committed by Kevin Krumm
parent 6dfa5ed75a
commit e3156cbef6
11 changed files with 65 additions and 26 deletions

View File

@@ -447,6 +447,7 @@ class Device extends BaseModel
return $query->where([
['status', '=', 1],
['ignore', '=', 0],
['disable_notify', '=', 0],
['disabled', '=', 0]
]);
}
@@ -463,6 +464,7 @@ class Device extends BaseModel
{
return $query->where([
['status', '=', 0],
['disable_notify', '=', 0],
['ignore', '=', 0],
['disabled', '=', 0]
]);
@@ -490,6 +492,21 @@ class Device extends BaseModel
]);
}
public function scopeIsDisableNotify($query)
{
return $query->where([
['disable_notify', '=', 1]
]);
}
public function scopeIsNotDisabled($query)
{
return $query->where([
['disable_notify', '=', 0],
['disabled', '=', 0]
]);
}
public function scopeCanPing(Builder $query)
{
return $query->where('disabled', 0)