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

Previous method didn't work, use new method

Browse Source
This commit is contained in:
Craig Williams
2022-02-28 11:19:16 +00:00
parent 1c4a71410d
commit 001559ed12
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Controller/OrganisationMembersController.php
View File

@@ -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;
}