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 82411e653df46892ad62bc5266041b9dc957c1b6..9d6412fa1a9e06df9084d814c5f35591dae3e6ee 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 @@ -96,15 +96,16 @@ export class EditIndividualsComponent implements OnInit { if (this.authService.portalUser && this.authService.portalUser.id === this.individualID) { this.individualID = "myuser" } + this.retrieveIndividual() for(var val of this.authService.portalUserJWT.realm_access.roles){ if (val ==='TESTBED_PROVIDER') { this.testbedProvider=true this.retrieveGeographicSite() console.log(this.geographicSite) - + } } - this.retrieveIndividual() + } else { for(var val of this.authService.portalUserJWT.realm_access.roles){ if (val ==='TESTBED_PROVIDER') { @@ -229,7 +230,7 @@ export class EditIndividualsComponent implements OnInit { } retrieveGeographicSite(){ - this.geographicSiteService.retrieveGeographicSite("myuser").subscribe( + this.geographicSiteService.retrieveGeographicSite(this.individual.id).subscribe( data => { this.geographicSite = data if (this.geographicSite.place[0].geographicAddress.city!==null){ @@ -330,7 +331,7 @@ export class EditIndividualsComponent implements OnInit { ) } else { - this.geographicSiteService.patchGeographicSite("myuser",updateObj).subscribe( + this.geographicSiteService.patchGeographicSite(id,updateObj).subscribe( data => { updatedGeographicSite = data }, error => console.error(error), () => { diff --git a/src/app/shared/components/redirect/redirect.component.ts b/src/app/shared/components/redirect/redirect.component.ts index 15fa38961c111d38ec2db9fb975c37aec41ac057..bad895e9d2c70a6036a4c9c00800160fd2d971d3 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', 'myuser']) + this.router.navigate(['services', 'services_marketplace']) } else if (activePortal === 'resources') { @@ -29,12 +29,12 @@ export class RedirectComponent implements OnInit { } else if (activePortal === 'testing') { - this.router.navigate(['testing/individual_update', 'myuser']) + this.router.navigate(['testing', 'service_test_specs']) } else if (activePortal === 'products') { - this.router.navigate(['products/individual_update', 'myuser']) + this.router.navigate(['products', 'marketplace']) } else {