Commit d504b4b0 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

ommit my-user functionality

parent f8defb1c

src/app/shared/components/partyManagement/edit-individuals/edit-individuals.component.ts

+5 −4
Original line number Original line Diff line number Diff line
@@ -96,6 +96,7 @@ export class EditIndividualsComponent implements OnInit { 
      if (this.authService.portalUser && this.authService.portalUser.id === this.individualID) {

      if (this.authService.portalUser && this.authService.portalUser.id === this.individualID) {

        this.individualID = "myuser"

        this.individualID = "myuser"

      }

      }

      this.retrieveIndividual()

      for(var val of this.authService.portalUserJWT.realm_access.roles){

      for(var val of this.authService.portalUserJWT.realm_access.roles){

            if (val ==='TESTBED_PROVIDER') {

            if (val ==='TESTBED_PROVIDER') {

              this.testbedProvider=true

              this.testbedProvider=true
@@ -104,7 +105,7 @@ export class EditIndividualsComponent implements OnInit { 




              }

              }

          }

          }

      this.retrieveIndividual()



    } else {

    } else {

      for(var val of this.authService.portalUserJWT.realm_access.roles){

      for(var val of this.authService.portalUserJWT.realm_access.roles){

        if (val ==='TESTBED_PROVIDER') {

        if (val ==='TESTBED_PROVIDER') {
@@ -229,7 +230,7 @@ export class EditIndividualsComponent implements OnInit { 
  }

  }





  retrieveGeographicSite(){

  retrieveGeographicSite(){

    this.geographicSiteService.retrieveGeographicSite("myuser").subscribe(

    this.geographicSiteService.retrieveGeographicSite(this.individual.id).subscribe(

      data => {

      data => {

        this.geographicSite = data

        this.geographicSite = data

        if (this.geographicSite.place[0].geographicAddress.city!==null){

        if (this.geographicSite.place[0].geographicAddress.city!==null){
@@ -330,7 +331,7 @@ export class EditIndividualsComponent implements OnInit { 
      )

      )

    }

    }

    else {

    else {

      this.geographicSiteService.patchGeographicSite("myuser",updateObj).subscribe(

      this.geographicSiteService.patchGeographicSite(id,updateObj).subscribe(

        data => { updatedGeographicSite = data },

        data => { updatedGeographicSite = data },

        error => console.error(error),

        error => console.error(error),

        () => {

        () => {

src/app/shared/components/redirect/redirect.component.ts

+3 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ export class RedirectComponent implements OnInit { 
    const activePortal = localStorage.getItem('active_portal')

    const activePortal = localStorage.getItem('active_portal')





    if (activePortal === 'services') {

    if (activePortal === 'services') {

      this.router.navigate(['services/individual_update', 'myuser'])

      this.router.navigate(['services', 'services_marketplace'])





    }

    }

    else if (activePortal === 'resources') {

    else if (activePortal === 'resources') {
@@ -29,12 +29,12 @@ export class RedirectComponent implements OnInit { 
    }

    }

    else if (activePortal === 'testing') {

    else if (activePortal === 'testing') {





      this.router.navigate(['testing/individual_update', 'myuser'])

      this.router.navigate(['testing', 'service_test_specs'])

    }

    }





    else if (activePortal === 'products') {

    else if (activePortal === 'products') {





          this.router.navigate(['products/individual_update', 'myuser'])

          this.router.navigate(['products', 'marketplace'])

    }

    }





    else {

    else {