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

chg: [mailinglist:addIndividual] Removed possiblity to edit individual already in the list 

This can be confusing and require special handling when saving joinData
pull/93/head
Sami Mokaddem 2021-11-12 13:49:54 +01:00
parent 2ba3e3ce00
commit 24e5a94662
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Controller/MailingListsController.php
View File

@ -2,6 +2,7 @@
namespace App\Controller;
use App\Controller\AppController;
use App\Model\Entity\Individual;
use Cake\Utility\Inflector;
use Cake\Utility\Hash;
use Cake\Utility\Text;
@ -173,16 +174,13 @@ class MailingListsController extends AppController
'id IN' => $memberIDs
])->all()->toArray();
$memberToLink = [];
$memberToUpdate = [];
foreach ($members as $i => $member) {
$includePrimary = in_array('primary', $chosen_emails[$member->id]);
$chosen_emails[$member->id] = array_filter($chosen_emails[$member->id], function($entry) {
return $entry != 'primary';
});
$members[$i]->_joinData = new Entity(['include_primary_email' => $includePrimary]);
if (in_array($member->id, $linkedIndividualsIDs)) { // individual already in the list
// $memberToUpdate[] = $members[$i];
} else { // new individual to add to the list
if (!in_array($member->id, $linkedIndividualsIDs)) { // individual are not already in the list
$memberToLink[] = $members[$i];
}
}
@ -198,28 +196,6 @@ class MailingListsController extends AppController
}
}
// update existing individuals
if (!empty($memberToUpdate)) {
$memberToUpdateIDs = Hash::extract($memberToUpdate, '{n}.id');
$metaFieldsToRemove = array_filter($mailingList->meta_fields, function($metaField) use ($memberToUpdateIDs) {
return in_array($metaField->parent_id, $memberToUpdateIDs);
});
// Trying to update `include_primary`...
// $success = (bool)$this->MailingLists->Individuals->unlink($mailingList, $memberToUpdate, ['atomic' => false]);
// $success = $success && (bool)$this->MailingLists->Individuals->link($mailingList, $memberToUpdate);
// Remove and add relevant meta fields
// $success = (bool)$this->MailingLists->MetaFields->unlink($mailingList, $metaFieldsToRemove, ['atomic' => false]);
// if ($success && !empty($chosen_emails[$member->id])) { // Include any remaining emails from the metaFields
// $emailsFromMetaFields = $this->MailingLists->MetaFields->find()->where([
// 'id IN' => $chosen_emails[$member->id]
// ])->all()->toArray();
// $success = (bool)$this->MailingLists->MetaFields->link($mailingList, $emailsFromMetaFields);
// }
}
if ($success) {
$message = __n('{0} individual added to the mailing list.', '{0} Individuals added to the mailing list.', count($members), count($members));
$mailingList = $this->MailingLists->get($mailingList->id);