From e9a1ac20189c16069913718958039a506295f072 Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Thu, 17 Feb 2022 18:35:54 +0000
Subject: [PATCH] Fixed bug preventing admin leaving organisation

---
 src/Controller/OrganisationMembersController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Controller/OrganisationMembersController.php b/src/Controller/OrganisationMembersController.php
index f5f3b6b..8b16a13 100644
--- a/src/Controller/OrganisationMembersController.php
+++ b/src/Controller/OrganisationMembersController.php
@@ -279,7 +279,8 @@ class OrganisationMembersController extends SimpleController
 
         // Check if the user is a member of the organisation, pending or no relation at all
         $memberCheck = $organisation->members()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first();
-        if (!$memberCheck || !$memberCheck->pivot->flag_approved) {
+        $adminCheck = $organisation->administrators()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first();
+        if (!($memberCheck && $memberCheck->pivot->flag_approved) && !($adminCheck && $adminCheck->pivot->flag_approved)) {
             $ms->addMessageTranslated('danger', 'ORGANISATION.NOT_A_MEMBER', [
                 'name' => $organisation->name
             ]);