diff --git a/app/Abstracts/View/Components/DocumentForm.php b/app/Abstracts/View/Components/DocumentForm.php index f48c804e8..336470ea2 100644 --- a/app/Abstracts/View/Components/DocumentForm.php +++ b/app/Abstracts/View/Components/DocumentForm.php @@ -456,8 +456,8 @@ abstract class DocumentForm extends Base $contacts = Contact::enabled()->orderBy('name')->take(setting('default.select_limit'))->get(); } - if (!empty($document) && ($document->contact && !$contacts->has($document->contact_id))) { - $contacts->put($document->contact->id, $document->contact->name); + if (!empty($document) && ($document->contact && !$contacts->contains('id', $document->contact_id))) { + $contacts->push($document->contact); } return $contacts; diff --git a/app/View/Components/SelectContactCard.php b/app/View/Components/SelectContactCard.php index 98b8ad531..1a93704dd 100644 --- a/app/View/Components/SelectContactCard.php +++ b/app/View/Components/SelectContactCard.php @@ -71,6 +71,10 @@ class SelectContactCard extends Component { if (empty($this->contacts)) { $this->contacts = Contact::{$this->type}()->enabled()->orderBy('name')->take(setting('default.select_limit'))->get(); + + if (!empty($this->contact) && (!$this->contacts->contains('id', $contact->id))) { + $this->contacts->push($this->contact); + } } if (empty($this->searchRoute)) {