@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | /** |
| 45 | 45 | * Update a notifications status. |
| 46 | 46 | * |
| 47 | - * @return \Illuminate\Http\Response |
|
| 47 | + * @return \Illuminate\Http\JsonResponse |
|
| 48 | 48 | */ |
| 49 | 49 | public function update($id, $action) |
| 50 | 50 | { |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | /** |
| 56 | 56 | * Create a new notification |
| 57 | 57 | * |
| 58 | - * @return \Illuminate\Http\Response |
|
| 58 | + * @return \Illuminate\Http\JsonResponse |
|
| 59 | 59 | */ |
| 60 | 60 | public function create(Request $request) |
| 61 | 61 | { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @param AdminOnlyRequest $request |
| 47 | 47 | * @param $user_id |
| 48 | 48 | * @param $port_id |
| 49 | - * @return mixed |
|
| 49 | + * @return \Illuminate\Http\RedirectResponse |
|
| 50 | 50 | */ |
| 51 | 51 | public function store(AdminOnlyRequest $request, $user_id) |
| 52 | 52 | { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @param AdminOnlyRequest $request |
| 70 | 70 | * @param $user_id |
| 71 | 71 | * @param $port_id |
| 72 | - * @return mixed |
|
| 72 | + * @return \Illuminate\Http\RedirectResponse |
|
| 73 | 73 | */ |
| 74 | 74 | public function destroy(AdminOnlyRequest $request, $user_id, $port_id) |
| 75 | 75 | { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @param AdminOnlyRequest $request |
| 47 | 47 | * @param $user_id |
| 48 | 48 | * @param $port_id |
| 49 | - * @return mixed |
|
| 49 | + * @return \Illuminate\Http\RedirectResponse |
|
| 50 | 50 | */ |
| 51 | 51 | public function store(AdminOnlyRequest $request, $user_id) |
| 52 | 52 | { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @param AdminOnlyRequest $request |
| 70 | 70 | * @param $user_id |
| 71 | 71 | * @param $port_id |
| 72 | - * @return mixed |
|
| 72 | + * @return \Illuminate\Http\RedirectResponse |
|
| 73 | 73 | */ |
| 74 | 74 | public function destroy(AdminOnlyRequest $request, $user_id, $port_id) |
| 75 | 75 | { |
@@ -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; |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * Store a newly created resource in storage. |
| 58 | 58 | * |
| 59 | 59 | * @param \Illuminate\Http\Request $request |
| 60 | - * @return \Illuminate\Http\Response |
|
| 60 | + * @return \Illuminate\Http\JsonResponse |
|
| 61 | 61 | */ |
| 62 | 62 | public function store(Request $request) |
| 63 | 63 | { |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | * Display the specified resource. |
| 71 | 71 | * |
| 72 | 72 | * @param int $id |
| 73 | - * @return \Illuminate\Http\Response |
|
| 73 | + * @return \Illuminate\Http\RedirectResponse |
|
| 74 | 74 | */ |
| 75 | 75 | public function show($id) |
| 76 | 76 | { |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | * |
| 95 | 95 | * @param \Illuminate\Http\Request $request |
| 96 | 96 | * @param int $id |
| 97 | - * @return \Illuminate\Http\Response |
|
| 97 | + * @return \Illuminate\Http\JsonResponse |
|
| 98 | 98 | */ |
| 99 | 99 | public function update(Request $request, $id) |
| 100 | 100 | { |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * Remove the specified resource from storage. |
| 109 | 109 | * |
| 110 | 110 | * @param int $id |
| 111 | - * @return \Illuminate\Http\Response |
|
| 111 | + * @return \Illuminate\Http\JsonResponse |
|
| 112 | 112 | */ |
| 113 | 113 | public function destroy($id) |
| 114 | 114 | { |
@@ -203,7 +203,7 @@ |
||
| 203 | 203 | * Convert a v1 device group pattern to v2 style |
| 204 | 204 | * |
| 205 | 205 | * @param $pattern |
| 206 | - * @return array |
|
| 206 | + * @return string |
|
| 207 | 207 | */ |
| 208 | 208 | private function convertV1Pattern($pattern) |
| 209 | 209 | { |
@@ -38,6 +38,9 @@ |
||
| 38 | 38 | return json_encode(self::generateMacroFilter('alert.macros.rule', self::generateTableFilter())); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | + /** |
|
| 42 | + * @param string $setting |
|
| 43 | + */ |
|
| 41 | 44 | private static function generateMacroFilter($setting, $filter = []) |
| 42 | 45 | { |
| 43 | 46 | foreach (Settings::get($setting, []) as $key => $value) { |