cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'main' into develop

pull/67/head
iglocska 2021-06-29 13:14:28 +02:00
parent 54924709a7 96248bbd00
commit c5e6016251
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Model/Table/InboxTable.php
View File

@ -75,15 +75,15 @@ class InboxTable extends AppTable
$errors[] = __('Unkown brood `{0}`', $entryData['data']['cerebrateURL']); $errors[] = __('Unkown brood `{0}`', $entryData['data']['cerebrateURL']);
} }
$found = false; // $found = false;
foreach ($user->individual->organisations as $organisations) { // foreach ($user->individual->organisations as $organisations) {
if ($organisations->id == $brood->organisation_id) { // if ($organisations->id == $brood->organisation_id) {
$found = true; // $found = true;
} // }
} // }
if (!$found) { // if (!$found) {
$errors[] = __('User `{0}` is not part of the brood\'s organisation. Make sure `{0}` is aligned with the organisation owning the brood.', $user->individual->email); // $errors[] = __('User `{0}` is not part of the brood\'s organisation. Make sure `{0}` is aligned with the organisation owning the brood.', $user->individual->email);
} // }
return $errors; return $errors;
} }

3
src/Model/Table/IndividualsTable.php
View File

@ -77,8 +77,9 @@ class IndividualsTable extends AppTable
$this->saveMetaFields($id, $individual); $this->saveMetaFields($id, $individual);
} }
if (!empty($individual['alignments'])) { if (!empty($individual['alignments'])) {
$Organisation = \Cake\ORM\TableRegistry::getTableLocator()->get('Organisations');
foreach ($individual['alignments'] as $alignment) { foreach ($individual['alignments'] as $alignment) {
$org_id = $this->Organisation->captureOrg($alignment['organisation']); $org_id = $Organisation->captureOrg($alignment['organisation']);
if ($org_id) { if ($org_id) {
$this->Alignments->setAlignment($org_id, $individual->id, $alignment['type']); $this->Alignments->setAlignment($org_id, $individual->id, $alignment['type']);
} }