diff --git a/DataTables/SystemLogsDataTable.php b/DataTables/SystemLogsDataTable.php index 1fe2860..df3124c 100644 --- a/DataTables/SystemLogsDataTable.php +++ b/DataTables/SystemLogsDataTable.php @@ -58,10 +58,10 @@ $content = $model->get('context'); return view('logs::system._details', compact('content')); - }) - ->addColumn('action', function (Collection $model) { - return view('logs::system._action-menu', compact('model')); }); + // ->addColumn('action', function (Collection $model) { + // return view('logs::system._action-menu', compact('model')); + // }); } /** @@ -121,11 +121,11 @@ Column::make('message'), Column::make('level'), Column::make('date')->width(130), - Column::computed('action') - ->exportable(false) - ->printable(false) - ->addClass('text-center') - ->responsivePriority(-1), + // Column::computed('action') + // ->exportable(false) + // ->printable(false) + // ->addClass('text-center') + // ->responsivePriority(-1), Column::make('environment')->addClass('none'), Column::make('file_path')->title(__('Log Path'))->addClass('none'), Column::make('context')->addClass('none'), diff --git a/Http/Controllers/AuditLogsController.php b/Http/Controllers/AuditLogsController.php index b0a4026..f5a9639 100644 --- a/Http/Controllers/AuditLogsController.php +++ b/Http/Controllers/AuditLogsController.php @@ -5,9 +5,20 @@ use App\Http\Controllers\Controller; use Modules\Logs\DataTables\AuditLogsDataTable; use Spatie\Activitylog\Models\Activity; + use Illuminate\Support\Facades\Auth; + class AuditLogsController extends Controller { + public $user; + + public function __construct() + { + $this->middleware(function ($request, $next) { + $this->user = Auth::guard('web')->user(); + return $next($request); + }); + } /** * Display a listing of the resource. * @@ -27,9 +38,15 @@ */ public function destroy($id) { + if (is_null($this->user) || !$this->user->can('logs.delete')) { + abort(403, 'Sorry !! You are Unauthorized to delete any data !'); + } + $activity = Activity::find($id); // Delete from db $activity->delete(); + + echo json_encode(['status' => 'success', 'message' => 'Data deleted successfully.']); } } diff --git a/Resources/views/audit/_action-menu.blade.php b/Resources/views/audit/_action-menu.blade.php index 4fb1431..f2ec835 100644 --- a/Resources/views/audit/_action-menu.blade.php +++ b/Resources/views/audit/_action-menu.blade.php @@ -1,7 +1,21 @@ +@php + $route = explode('.', Route::currentRouteName()); +@endphp - + + + + +
+ + + + +
@include('logs::audit._table') diff --git a/Resources/views/system/_table.blade.php b/Resources/views/system/_table.blade.php index 21185fe..541b088 100644 --- a/Resources/views/system/_table.blade.php +++ b/Resources/views/system/_table.blade.php @@ -19,7 +19,7 @@ LaravelDataTables["system-log-table"].search(this.value).draw(); }); - const documentTitle = 'System Report'; + const documentTitle = 'Log System Report'; $(function () { var buttons = new $.fn.dataTable.Buttons(LaravelDataTables["system-log-table"], { diff --git a/Resources/views/system/index.blade.php b/Resources/views/system/index.blade.php index ae5942d..9923ee1 100644 --- a/Resources/views/system/index.blade.php +++ b/Resources/views/system/index.blade.php @@ -78,13 +78,13 @@
- - -
- @include('logs::system._table') -
- + + +
+ @include('logs::system._table') +
+