Fixes for activity display for lesser permissioned users

app/Http/Controllers/ActivityController.php

@@ -102,7 +102,9 @@ class ActivityController extends BaseController
         /** @var \App\Models\User auth()->user() */
         $user = auth()->user();
 
-        if (!$user->isAdmin()) {
+        $entity = $request->getEntity();
+
+        if ($user->cannot('view', $entity)) {
             $activities->where('user_id', auth()->user()->id);
         }
 

app/Http/Requests/Activity/ShowActivityRequest.php

@@ -12,6 +12,7 @@
 
 namespace App\Http\Requests\Activity;
 
+use Illuminate\Support\Str;
 use App\Http\Requests\Request;
 use App\Utils\Traits\MakesHash;
 
@@ -48,4 +49,16 @@ class ShowActivityRequest extends Request
         $this->replace($input);
 
     }
+
+    public function getEntity()
+    {
+        if (!$this->entity) {
+            return false;
+        }
+
+        $class = "\\App\\Models\\".ucfirst(Str::camel(rtrim($this->entity, 's')));
+        return $class::withTrashed()->company()->where('id', is_string($this->entity_id) ? $this->decodePrimaryKey($this->entity_id) : $this->entity_id)->first();
+
+    }
+    
 }

app/Http/Requests/Activity/StoreNoteRequest.php

@@ -18,6 +18,8 @@ use Illuminate\Validation\Rule;
 
 class StoreNoteRequest extends Request
 {
+    public $error_message;
+    
     /**
      * Determine if the user is authorized to make this request.
      *