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

Fixed nulled organisation name

Browse Source
This commit is contained in:
Craig Williams
2022-02-15 15:49:47 +00:00
parent d31bdd9970
commit abe208bc50
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Controller/OrganisationController.php
View File

@@ -359,10 +359,10 @@ class OrganisationController extends SimpleController
throw new NotFoundException(); throw new NotFoundException();
} }
// Begin transaction - DB will be rolled back if an exception occurs $sourceName = $source->name;
Capsule::transaction(function () use ($source, $target, $currentUser) {
$sourceName = $source->name;
// Begin transaction - DB will be rolled back if an exception occurs
Capsule::transaction(function () use ($source, $target, $currentUser, $sourceName) {
$this->ci->get('organisation.beforeMerge')($source, $target); $this->ci->get('organisation.beforeMerge')($source, $target);
$source->beforeMerge($target, ['currentUser' => $currentUser]); $source->beforeMerge($target, ['currentUser' => $currentUser]);
@@ -431,10 +431,10 @@ class OrganisationController extends SimpleController
throw new ForbiddenException(); throw new ForbiddenException();
} }
// Begin transaction - DB will be rolled back if an exception occurs $organisationName = $organisation->name;
Capsule::transaction(function () use ($organisation, $currentUser) {
$organisationName = $organisation->name;
// Begin transaction - DB will be rolled back if an exception occurs
Capsule::transaction(function () use ($organisation, $currentUser, $organisationName) {
// Delete the organisation (soft) // Delete the organisation (soft)
$organisation->delete(); $organisation->delete();
unset($organisation); unset($organisation);

6
src/Controller/OrganisationRegistrationController.php
View File

@@ -206,10 +206,10 @@ class OrganisationRegistrationController extends SimpleController
throw new ForbiddenException(); throw new ForbiddenException();
} }
$organisationName = $organisation->name;
// Begin transaction - DB will be rolled back if an exception occurs // Begin transaction - DB will be rolled back if an exception occurs
Capsule::transaction(function () use ($organisation, $currentUser) { Capsule::transaction(function () use ($organisation, $currentUser, $organisationName) {
$organisationName = $organisation->name;
// Delete the organisation // Delete the organisation
$organisation->delete(true); $organisation->delete(true);
unset($organisation); unset($organisation);