Dev/v1.2 (#4)

Co-authored-by: ISMAIL MASSERAN <topaz@Mac.dlinkrouter.local> Reviewed-on: #4
2026-07-06 12:50:55 +08:00
parent e77712105c
commit d06c4701a4
190 changed files with 5365 additions and 26981 deletions
@@ -3,17 +3,22 @@
 namespace Modules\ActivityLog\Http\Controllers;

 use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Http\Request;
 use Spatie\Activitylog\Models\Activity;
 use App\Services\ActivityLogger;

 class ActivityLogController extends Controller
 {
+    use AuthorizesRequests;
+
    /**
     * Display a listing of the resource.
     */
    public function index(Request $request)
    {
+        $this->authorize('viewAny', Activity::class);
+
        // ActivityLogger::logView(new Activity, 'Viewed activity logs');

        $perPage = $request->get('per_page', 10);
@@ -27,8 +32,10 @@ class ActivityLogController extends Controller
                $q->where('description', 'ILIKE', "%{$search}%")
                    ->orWhere('subject_type', 'ILIKE', "%{$search}%")
                    ->orWhere('event', 'ILIKE', "%{$search}%")
-                    ->orWhere('causer.name', 'ILIKE', "%{$search}%")
-                    ->orWhere('causer.email', 'ILIKE', "%{$search}%");
+                    ->orWhereHas('causer', function ($causerQuery) use ($search) {
+                        $causerQuery->where('name', 'ILIKE', "%{$search}%")
+                            ->orWhere('email', 'ILIKE', "%{$search}%");
+                    });
            });
        }