@@ -25,7 +25,6 @@ |
||
| 25 | 25 | |
| 26 | 26 | namespace App\DataTables; |
| 27 | 27 | |
| 28 | -use App\Models\DeviceGroup; |
|
| 29 | 28 | use App\Models\Device; |
| 30 | 29 | |
| 31 | 30 | class DeviceDataTable extends BaseDataTable |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use App\DataTables\DeviceDataTable; |
| 6 | -use App\DataTables\DeviceGroupDataTable; |
|
| 7 | 6 | use App\Models\DeviceGroup; |
| 8 | 7 | use Dingo\Api\Http; |
| 9 | 8 | use Dingo\Api\Routing\Helpers; |
@@ -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 | } |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Api\Controllers; |
| 4 | 4 | |
| 5 | 5 | use DB; |
| 6 | -use App\Http\Requests; |
|
| 7 | 6 | use Illuminate\Http\Request; |
| 8 | 7 | |
| 9 | 8 | class ApiController extends Controller |
@@ -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 | } |