Skip to content
Snippets Groups Projects
Verified Commit 23c4ec91 authored by Damien's avatar Damien
Browse files

FEAT #12091 TIME 0:20 Fix contacts autocomplete

parent 9ee4ab3f
No related branches found
No related tags found
No related merge requests found
...@@ -98,6 +98,9 @@ class ContactController ...@@ -98,6 +98,9 @@ class ContactController
'limit' => $queryParams['limit'] 'limit' => $queryParams['limit']
]); ]);
$count = $contacts[0]['count'] ?? 0; $count = $contacts[0]['count'] ?? 0;
if (empty($contacts)) {
return $response->withJson(['contacts' => $contacts, 'count' => $count]);
}
$contactIds = array_column($contacts, 'id'); $contactIds = array_column($contacts, 'id');
$contactsUsed = ContactController::isContactUsed(['ids' => $contactIds]); $contactsUsed = ContactController::isContactUsed(['ids' => $contactIds]);
......
...@@ -11,7 +11,6 @@ import { takeUntil, startWith, switchMap, map, catchError, filter, exhaustMap, t ...@@ -11,7 +11,6 @@ import { takeUntil, startWith, switchMap, map, catchError, filter, exhaustMap, t
import { ConfirmComponent } from '../../../../plugins/modal/confirm.component'; import { ConfirmComponent } from '../../../../plugins/modal/confirm.component';
import { FormControl } from '@angular/forms'; import { FormControl } from '@angular/forms';
import { FunctionsService } from '../../../../service/functions.service'; import { FunctionsService } from '../../../../service/functions.service';
import {UserAdministrationRedirectModalComponent} from "../../user/user-administration.component";
@Component({ @Component({
selector: 'contact-list', selector: 'contact-list',
...@@ -131,7 +130,7 @@ export class ContactsListAdministrationComponent implements OnInit { ...@@ -131,7 +130,7 @@ export class ContactsListAdministrationComponent implements OnInit {
element.formatedAddress = tmpFormatedAddress.filter(address => !this.isEmptyValue(address)).join(' '); element.formatedAddress = tmpFormatedAddress.filter(address => !this.isEmptyValue(address)).join(' ');
}); });
if (!this.functions.empty(data.contacts[0].filling)) { if (!this.functions.empty(data.contacts[0]) && !this.functions.empty(data.contacts[0].filling)) {
this.displayedColumnsContact = ['filling', 'firstname', 'lastname', 'company', 'formatedAddress', 'actions']; this.displayedColumnsContact = ['filling', 'firstname', 'lastname', 'company', 'formatedAddress', 'actions'];
} else { } else {
this.displayedColumnsContact = ['firstname', 'lastname', 'company', 'formatedAddress', 'actions']; this.displayedColumnsContact = ['firstname', 'lastname', 'company', 'formatedAddress', 'actions'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment