@@ -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 | { |
@@ -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) |
@@ -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) { |