From b7d15dc25eec4c47c7bc9d373e0e868f4fabd7d0 Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Tue, 6 Jun 2023 15:48:53 +0100
Subject: [PATCH] Removed hasRole twig function

---
 src/Twig/OrganisationsExtension.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Twig/OrganisationsExtension.php b/src/Twig/OrganisationsExtension.php
index e1dc4b2..a9aea51 100644
--- a/src/Twig/OrganisationsExtension.php
+++ b/src/Twig/OrganisationsExtension.php
@@ -66,18 +66,14 @@ class OrganisationsExtension extends AbstractExtension implements GlobalsInterfa
                 return Capsule::table('organisation_members')
                     ->where('user_id', $currentUser->id)
                     ->where('organisation_id', $organisation->id)
-                    ->where('flag_admin', true)
                     ->where('flag_approved', true)
+                    ->where('flag_admin', true)
                     ->count() > 0;
             }),
             new TwigFunction('isOrganisationRegistrant', function ($organisation) {
                 $currentUser = $this->services->currentUser;
                 return $organisation->registrant_id == $currentUser->id;
             }),
-            new TwigFunction('hasRole', function ($roleSlug) {
-                $currentUser = $this->services->currentUser;
-                return $currentUser->roles()->where('slug', $roleSlug)->count() > 0;
-            }),
         ];
     }