diff --git a/src/Twig/OrganisationsExtension.php b/src/Twig/OrganisationsExtension.php index c825c62..e1dc4b2 100644 --- a/src/Twig/OrganisationsExtension.php +++ b/src/Twig/OrganisationsExtension.php @@ -57,6 +57,7 @@ class OrganisationsExtension extends AbstractExtension implements GlobalsInterfa return Capsule::table('organisation_members') ->where('user_id', $currentUser->id) ->where('organisation_id', $organisation->id) + ->where('flag_approved', true) ->count() > 0; }), new TwigFunction('isOrganisationAdmin', function ($organisation) { @@ -66,8 +67,13 @@ class OrganisationsExtension extends AbstractExtension implements GlobalsInterfa ->where('user_id', $currentUser->id) ->where('organisation_id', $organisation->id) ->where('flag_admin', true) + ->where('flag_approved', 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;