[TM-1171] fix role policy check

wri · Aug 21, 2024 · 05591af · 05591af
1 parent b51280c
commit 05591af
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/app/Policies/V2/Nurseries/NurseryPolicy.php b/app/Policies/V2/Nurseries/NurseryPolicy.php
@@ -122,7 +122,7 @@ public function approve(?User $user, ?Nursery $nursery = null): bool
 
     public function export(?User $user, ?Form $form = null, ?Project $project = null): bool
     {
-        if ($user->primaryRole?->name == 'project-manager') {
+        if ($user->hasRole('project-manager')) {
             return $user->my_frameworks_slug->contains($form->framework_key);
         }
 

diff --git a/app/Policies/V2/Nurseries/NurseryReportPolicy.php b/app/Policies/V2/Nurseries/NurseryReportPolicy.php
@@ -132,7 +132,7 @@ protected function isManagingProject(User $user, Project $project): bool
 
     public function export(?User $user, ?Form $form = null, ?Project $project = null): bool
     {
-        if ($user->primaryRole?->name == 'project-manager') {
+        if ($user->hasRole('project-manager')) {
             return $user->my_frameworks_slug->contains($form->framework_key);
         }
 

diff --git a/app/Policies/V2/Projects/ProjectPolicy.php b/app/Policies/V2/Projects/ProjectPolicy.php
@@ -186,7 +186,7 @@ protected function isManaging(?User $user, ?Project $project = null): bool
 
     public function export(?User $user, ?Form $form = null, ?Project $project = null): bool
     {
-        if ($user->primaryRole?->name == 'project-manager') {
+        if ($user->hasRole('project-manager')) {
             return $user->my_frameworks_slug->contains($form->framework_key);
         }
 

diff --git a/app/Policies/V2/Projects/ProjectReportPolicy.php b/app/Policies/V2/Projects/ProjectReportPolicy.php
@@ -128,7 +128,7 @@ protected function isManagingProject(User $user, Project $project): bool
 
     public function export(?User $user, ?Form $form = null, ?Project $project = null): bool
     {
-        if ($user->primaryRole?->name == 'project-manager') {
+        if ($user->hasRole('project-manager')) {
             return $user->my_frameworks_slug->contains($form->framework_key);
         }
 

diff --git a/app/Policies/V2/Sites/SitePolicy.php b/app/Policies/V2/Sites/SitePolicy.php
@@ -159,7 +159,7 @@ public function uploadPolygons(?User $user, ?Site $site): bool
 
     public function export(?User $user, ?Form $form = null, ?Project $project = null): bool
     {
-        if ($user->primaryRole?->name == 'project-manager') {
+        if ($user->hasRole('project-manager')) {
             return $user->my_frameworks_slug->contains($form->framework_key);
         }
 

diff --git a/app/Policies/V2/Sites/SiteReportPolicy.php b/app/Policies/V2/Sites/SiteReportPolicy.php
@@ -128,7 +128,7 @@ protected function isManagingProject(User $user, Project $project): bool
 
     public function export(?User $user, ?Form $form = null, ?Project $project = null): bool
     {
-        if ($user->primaryRole?->name == 'project-manager') {
+        if ($user->hasRole('project-manager')) {
             return $user->my_frameworks_slug->contains($form->framework_key);
         }