diff --git a/src/app/shared/components/partyManagement/edit-individuals/edit-individuals.component.ts b/src/app/shared/components/partyManagement/edit-individuals/edit-individuals.component.ts index be056a8eb2c9edf4a8865964e358a0041e7c31a5..82411e653df46892ad62bc5266041b9dc957c1b6 100644 --- a/src/app/shared/components/partyManagement/edit-individuals/edit-individuals.component.ts +++ b/src/app/shared/components/partyManagement/edit-individuals/edit-individuals.component.ts @@ -101,10 +101,7 @@ export class EditIndividualsComponent implements OnInit { this.testbedProvider=true this.retrieveGeographicSite() console.log(this.geographicSite) - if (this.geographicSite.place[0].geographicAddress.city!==null){ - this.hasGeographicSite=true - console.log(this.hasGeographicSite) - } + } } this.retrieveIndividual() @@ -233,7 +230,13 @@ export class EditIndividualsComponent implements OnInit { retrieveGeographicSite(){ this.geographicSiteService.retrieveGeographicSite("myuser").subscribe( - data => this.geographicSite = data, + data => { + this.geographicSite = data + if (this.geographicSite.place[0].geographicAddress.city!==null){ + this.hasGeographicSite=true + console.log(this.hasGeographicSite) + } + }, error => console.error(error), () => { this.editForm.patchValue({ diff --git a/src/app/shared/components/redirect/redirect.component.ts b/src/app/shared/components/redirect/redirect.component.ts index aabf2086ed147c00750108530f0f8935b6d6ca38..15fa38961c111d38ec2db9fb975c37aec41ac057 100644 --- a/src/app/shared/components/redirect/redirect.component.ts +++ b/src/app/shared/components/redirect/redirect.component.ts @@ -21,7 +21,7 @@ export class RedirectComponent implements OnInit { const activePortal = localStorage.getItem('active_portal') if (activePortal === 'services') { - this.router.navigate(['services', 'individual_update']) + this.router.navigate(['services/individual_update', 'myuser']) } else if (activePortal === 'resources') { @@ -29,12 +29,12 @@ export class RedirectComponent implements OnInit { } else if (activePortal === 'testing') { - this.router.navigate(['testing', 'individual_update']) + this.router.navigate(['testing/individual_update', 'myuser']) } else if (activePortal === 'products') { - this.router.navigate(['products', 'individual_update']) + this.router.navigate(['products/individual_update', 'myuser']) } else {