From d3726e6bdc0261a3ebdd3c50903d774258a87d08 Mon Sep 17 00:00:00 2001
From: ottorei <otto@ottorei.fi>
Date: Tue, 19 Oct 2021 06:18:29 +0300
Subject: [PATCH] Update alertlog-widget to allow filtering by device group
 (#13380)

* Add group filter to alertlog widget

* Remove extra characters from settings

* Apply fixes from StyleCI

Co-authored-by: ottorei <ottorei@users.noreply.github.com>
---
 app/Http/Controllers/Widgets/AlertlogController.php |  1 +
 includes/html/table/alertlog.inc.php                |  5 +++++
 resources/views/widgets/alertlog.blade.php          |  1 +
 resources/views/widgets/settings/alertlog.blade.php | 13 +++++++++++--
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Widgets/AlertlogController.php b/app/Http/Controllers/Widgets/AlertlogController.php
index ea67b5389b..181276e0fa 100644
--- a/app/Http/Controllers/Widgets/AlertlogController.php
+++ b/app/Http/Controllers/Widgets/AlertlogController.php
@@ -33,6 +33,7 @@ class AlertlogController extends WidgetController
     protected $defaults = [
         'title' => null,
         'device_id' => '',
+        'device_group' => null,
         'state' => -1,
         'min_severity' => null,
         'hidenavigation' => 0,
diff --git a/includes/html/table/alertlog.inc.php b/includes/html/table/alertlog.inc.php
index b120b7d91d..05dc46f1fb 100644
--- a/includes/html/table/alertlog.inc.php
+++ b/includes/html/table/alertlog.inc.php
@@ -40,6 +40,11 @@ if (isset($vars['min_severity'])) {
     $where .= get_sql_filter_min_severity($vars['min_severity'], 'R');
 }
 
+if (is_numeric($vars['device_group'])) {
+    $where .= ' AND D.device_id IN (SELECT `device_id` FROM `device_group_device` WHERE `device_group_id` = ?)';
+    $param[] = $vars['device_group'];
+}
+
 if (! Auth::user()->hasGlobalRead()) {
     $device_ids = Permissions::devicesForUser()->toArray() ?: [0];
     $where .= ' AND `E`.`device_id` IN ' . dbGenPlaceholders(count($device_ids));
diff --git a/resources/views/widgets/alertlog.blade.php b/resources/views/widgets/alertlog.blade.php
index 62c39e656c..9f8c58e85b 100644
--- a/resources/views/widgets/alertlog.blade.php
+++ b/resources/views/widgets/alertlog.blade.php
@@ -20,6 +20,7 @@
             return {
                 id: "alertlog",
                 device_id: "",
+                device_group: "{{ $device_group }}",
                 state: '{{ $state }}',
                 min_severity: '{{ $min_severity }}',
             };
diff --git a/resources/views/widgets/settings/alertlog.blade.php b/resources/views/widgets/settings/alertlog.blade.php
index a20b5ba5ef..923314ca42 100644
--- a/resources/views/widgets/settings/alertlog.blade.php
+++ b/resources/views/widgets/settings/alertlog.blade.php
@@ -6,7 +6,7 @@
         <input type="text" class="form-control" name="title" id="title-{{ $id }}" placeholder="@lang('Custom title')" value="{{ $title }}">
     </div>
     <div class="form-group">
-        <label for="state-{{ $id }}" class="control-label">@lang('State'):</label>
+        <label for="state-{{ $id }}" class="control-label">@lang('State')</label>
         <select class="form-control" name="state" id="state-{{ $id }}">
             <option value="-1">@lang('not filtered')</option>
             <option value="0" @if($state === '1') selected @endif>@lang('OK')</option>
@@ -14,7 +14,7 @@
         </select>
     </div>
     <div class="form-group">
-        <label for="min_severity-{{ $id }}" class="control-label">@lang('Displayed severity'):</label>
+        <label for="min_severity-{{ $id }}" class="control-label">@lang('Displayed severity')</label>
         <select class="form-control" name="min_severity" id="min_severity-{{ $id }}">
             <option value="">@lang('any severity')</option>
             @foreach($severities as $name => $val)
@@ -22,6 +22,14 @@
             @endforeach
         </select>
     </div>
+    <div class="form-group">
+        <label for="device_group-{{ $id }}" class="control-label">@lang('Device group')</label>
+        <select class="form-control" name="device_group" id="device_group-{{ $id }}" data-placeholder="@lang('All Devices')">
+            @if($device_group)
+                <option value="{{ $device_group->id }}" selected>{{ $device_group->name }}</option>
+            @endif
+        </select>
+    </div>
     <div class="form-group">
         <label for="hidenavigation-{{ $id }}" class="control-label">@lang('Hide Navigation')</label>
         <input type="checkbox" class="form-control" name="hidenavigation" id="hidenavigation-{{ $id }}" value="{{ $hidenavigation }}" data-size="normal" @if($hidenavigation) checked @endif>
@@ -30,6 +38,7 @@
 
 @section('javascript')
     <script type="text/javascript">
+        init_select2('#device_group-{{ $id }}', 'device-group', {});
         $('#hidenavigation-{{ $id }}')
             .bootstrapSwitch('offColor','danger')
             .on('switchChange.bootstrapSwitch', function (e, data) {