From 3827b09673684feee871b939b4d104c24282052e Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Wed, 10 Mar 2021 17:09:21 +0100
Subject: [PATCH] fix: header name display + address-autocomplete bug
---
src/app/header/header.component.scss | 5 +++++
.../address-autocomplete.component.ts | 9 ++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index 8369791d6..6a991d53b 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -41,6 +41,11 @@ button {
&.red {
@include btn-red;
border: none;
+ // user name ellipsis handling
+ white-space: nowrap;
+ width: 100px;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
diff --git a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
index c0dce3bde..e04af8369 100644
--- a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
+++ b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
@@ -20,9 +20,12 @@ export class AddressAutocompleteComponent implements OnInit {
ngOnInit(): void {
if (this.address) {
- const address_str = this.address.numero
- ? this.address.numero + ' '
- : '' + this.address.street + ' ' + this.address.commune;
+ let address_str = null;
+ if (this.address.numero) {
+ address_str = this.address.numero + ' ' + this.address.street + ' ' + this.address.commune;
+ } else {
+ address_str = this.address.street + ' ' + this.address.commune;
+ }
this.searchAddress.nativeElement.value = address_str;
}
}
--
GitLab