@@ -73,7 +73,7 @@ |
||
| 73 | 73 | */ |
| 74 | 74 | public function show(Request $request, $id) |
| 75 | 75 | { |
| 76 | - $widget = Widgets::find($id); |
|
| 76 | + $widget = Widgets::find($id); |
|
| 77 | 77 | return array('widget' => $widget); |
| 78 | 78 | } |
| 79 | 79 | |
@@ -18,10 +18,10 @@ |
||
| 18 | 18 | * |
| 19 | 19 | * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View |
| 20 | 20 | */ |
| 21 | - public function index(DeviceDataTable $dataTable, $group_id=-1) |
|
| 21 | + public function index(DeviceDataTable $dataTable, $group_id = -1) |
|
| 22 | 22 | { |
| 23 | 23 | $group_name = ""; |
| 24 | - if($group_id >= 0) { |
|
| 24 | + if ($group_id >= 0) { |
|
| 25 | 25 | $dataTable->addScope(new \App\DataTables\Scopes\DeviceGroup($group_id)); |
| 26 | 26 | $group_name = DeviceGroup::find($group_id)->name; |
| 27 | 27 | } |
@@ -177,7 +177,7 @@ |
||
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | foreach (Settings::get('alert.macros.group', []) as $macro => $value) { |
| 180 | - $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value); // this might need something more complex |
|
| 180 | + $value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value); // this might need something more complex |
|
| 181 | 181 | if (!str_contains($macro, ' ')) { |
| 182 | 182 | $pattern = str_replace('macros.'.$macro, '('.$value.')', $pattern); |
| 183 | 183 | } |