AVSDev/sprinkle-organisations
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fixed bug preventing admin leaving organisation

Browse Source
This commit is contained in:
Craig Williams
2022-02-17 18:35:54 +00:00
parent 2da722f84e
commit e9a1ac2018
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Controller/OrganisationMembersController.php
View File

@@ -279,7 +279,8 @@ class OrganisationMembersController extends SimpleController
// Check if the user is a member of the organisation, pending or no relation at all // 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(); $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', [ $ms->addMessageTranslated('danger', 'ORGANISATION.NOT_A_MEMBER', [
'name' => $organisation->name 'name' => $organisation->name
]); ]);