From 001559ed12caad46a22d0bde9502165cccf32643 Mon Sep 17 00:00:00 2001 From: Craig Williams Date: Mon, 28 Feb 2022 11:19:16 +0000 Subject: [PATCH] Previous method didn't work, use new method --- .../OrganisationMembersController.php | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/Controller/OrganisationMembersController.php b/src/Controller/OrganisationMembersController.php index 3b1d30b..8c3dd8b 100644 --- a/src/Controller/OrganisationMembersController.php +++ b/src/Controller/OrganisationMembersController.php @@ -1057,10 +1057,17 @@ class OrganisationMembersController extends SimpleController /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ $ms = $this->ci->alerts; + /** @var \UserFrosting\Sprinkle\Organisations\Repository\OrganisationMembershipApprovalRepository */ + $tokenRepo = $this->ci->repoOrganisationMembershipApproval; + + + if ($manual && !$tokenRepo->exists($tokenOwner)) { + $tokenRepo->create($tokenOwner, 1); + } // Try and complete the token, bail if not found - $verification = $this->ci->repoOrganisationMembershipApproval->completeForOwner($tokenOwner, ['approved' => true, 'approver_id' => $currentUser->id]); - if (!$verification && !$manual) { + $verification = $tokenRepo->completeForOwner($tokenOwner, ['approved' => true, 'approver_id' => $currentUser->id]); + if (!$verification) { $ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND'); return false; } @@ -1091,10 +1098,17 @@ class OrganisationMembersController extends SimpleController /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ $ms = $this->ci->alerts; + /** @var \UserFrosting\Sprinkle\Organisations\Repository\OrganisationMembershipApprovalRepository */ + $tokenRepo = $this->ci->repoOrganisationMembershipApproval; + + + if ($manual && !$tokenRepo->exists($tokenOwner)) { + $tokenRepo->create($tokenOwner, 1); + } // Try and complete the token, bail if not found - $verification = $this->ci->repoOrganisationMembershipApproval->completeForOwner($tokenOwner, ['approved' => false, 'approver_id' => $currentUser->id]); - if (!$verification && !$manual) { + $verification = $tokenRepo->completeForOwner($tokenOwner, ['approved' => false, 'approver_id' => $currentUser->id]); + if (!$verification) { $ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND'); return false; }