@@ -25,7 +25,6 @@ |
||
| 25 | 25 | |
| 26 | 26 | namespace App\DataTables\Alerting; |
| 27 | 27 | |
| 28 | -use App\Models\Alerting\Alert; |
|
| 29 | 28 | use App\Models\Alerting\Log; |
| 30 | 29 | use Yajra\Datatables\Services\DataTable; |
| 31 | 30 | |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | */ |
| 90 | 90 | public function query() |
| 91 | 91 | { |
| 92 | - $logs = Log::query()->with('device','user','rule')->select('alert_log.*'); |
|
| 92 | + $logs = Log::query()->with('device', 'user', 'rule')->select('alert_log.*'); |
|
| 93 | 93 | return $this->applyScopes($logs); |
| 94 | 94 | } |
| 95 | 95 | |
@@ -102,7 +102,8 @@ |
||
| 102 | 102 | } catch(\Exception $e) { |
| 103 | 103 | if(starts_with($e->getMessage(), 'unserialize():')) { |
| 104 | 104 | return $value; |
| 105 | - } else { |
|
| 105 | + } |
|
| 106 | + else { |
|
| 106 | 107 | throw $e; |
| 107 | 108 | } |
| 108 | 109 | } |
@@ -25,9 +25,9 @@ |
||
| 25 | 25 | |
| 26 | 26 | namespace App\Http\Controllers\Alerting; |
| 27 | 27 | |
| 28 | -use Illuminate\Http\Request; |
|
| 29 | 28 | use App\DataTables\AlertsDataTable; |
| 30 | 29 | use App\Http\Controllers\Controller; |
| 30 | +use Illuminate\Http\Request; |
|
| 31 | 31 | |
| 32 | 32 | class AlertsController extends Controller |
| 33 | 33 | { |