| @@ -58,7 +58,7 @@ discard block | ||
| 58 | 58 | * Store a newly created resource in storage. | 
| 59 | 59 | * | 
| 60 | 60 | * @param \Illuminate\Http\Request $request | 
| 61 | - * @return \Illuminate\Http\Response | |
| 61 | + * @return \Illuminate\Http\JsonResponse | |
| 62 | 62 | */ | 
| 63 | 63 | public function store(DeviceGroupRequest $request) | 
| 64 | 64 |      { | 
| @@ -71,7 +71,7 @@ discard block | ||
| 71 | 71 | * Display the specified resource. | 
| 72 | 72 | * | 
| 73 | 73 | * @param int $id | 
| 74 | - * @return \Illuminate\Http\Response | |
| 74 | + * @return \Illuminate\Http\RedirectResponse | |
| 75 | 75 | */ | 
| 76 | 76 | public function show($id) | 
| 77 | 77 |      { | 
| @@ -95,7 +95,7 @@ discard block | ||
| 95 | 95 | * | 
| 96 | 96 | * @param \Illuminate\Http\Request $request | 
| 97 | 97 | * @param int $id | 
| 98 | - * @return \Illuminate\Http\Response | |
| 98 | + * @return \Illuminate\Http\JsonResponse | |
| 99 | 99 | */ | 
| 100 | 100 | public function update(DeviceGroupRequest $request, $id) | 
| 101 | 101 |      { | 
| @@ -110,7 +110,7 @@ discard block | ||
| 110 | 110 | * | 
| 111 | 111 | * @param \Illuminate\Http\Request $request | 
| 112 | 112 | * @param int $id | 
| 113 | - * @return \Illuminate\Http\Response | |
| 113 | + * @return \Illuminate\Http\JsonResponse | |
| 114 | 114 | * @throws \Exception | 
| 115 | 115 | */ | 
| 116 | 116 | public function destroy(AdminOnlyRequest $request, $id) | 
| @@ -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) { | 
| @@ -60,7 +60,6 @@ | ||
| 60 | 60 | /** | 
| 61 | 61 | * Display the alerts widget. | 
| 62 | 62 | * | 
| 63 | - * @param AlertsDataTable $dataTable | |
| 64 | 63 | * @param null $action | 
| 65 | 64 | * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View | 
| 66 | 65 | */ | 
| @@ -43,7 +43,7 @@ discard block | ||
| 43 | 43 | * Store a newly created resource in storage. | 
| 44 | 44 | * | 
| 45 | 45 | * @param CreateUserRequest $request | 
| 46 | - * @return \Illuminate\Http\Response | |
| 46 | + * @return \Illuminate\Http\JsonResponse | |
| 47 | 47 | */ | 
| 48 | 48 | public function store(CreateUserRequest $request) | 
| 49 | 49 |      { | 
| @@ -119,7 +119,7 @@ discard block | ||
| 119 | 119 | * Remove the specified resource from storage. | 
| 120 | 120 | * | 
| 121 | 121 | * @param int $user_id | 
| 122 | - * @return \Illuminate\Http\Response | |
| 122 | + * @return \Illuminate\Http\JsonResponse | |
| 123 | 123 | */ | 
| 124 | 124 | public function destroy(DeleteUserRequest $request, $user_id) | 
| 125 | 125 |      { | 
| @@ -207,7 +207,7 @@ | ||
| 207 | 207 | * Convert a v1 device group pattern to sql that can be ingested by jQuery-QueryBuilder | 
| 208 | 208 | * | 
| 209 | 209 | * @param $pattern | 
| 210 | - * @return array | |
| 210 | + * @return string | |
| 211 | 211 | */ | 
| 212 | 212 | private function convertV1Pattern($pattern) | 
| 213 | 213 |      { |