From c71d62d671c672ad35f8c93daeadc32c75b6ee81 Mon Sep 17 00:00:00 2001 From: theresa Date: Mon, 22 Jul 2024 14:24:50 +0200 Subject: [PATCH] #3353 fixed display of access ways --- .../data-package-configurator.controller.js | 11 +++++------ .../components/data-package-configurator.html.tmpl | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mdm-frontend/src/app/legacy/ordermanagement/components/data-package-configurator.controller.js b/mdm-frontend/src/app/legacy/ordermanagement/components/data-package-configurator.controller.js index 29d5009926..9910d52a6d 100644 --- a/mdm-frontend/src/app/legacy/ordermanagement/components/data-package-configurator.controller.js +++ b/mdm-frontend/src/app/legacy/ordermanagement/components/data-package-configurator.controller.js @@ -116,7 +116,7 @@ } } $ctrl.releases = releaseList; - if (releases.length === 0 || rel.length === 0) { + if (releases.length === 0 || releaseList.length === 0) { $ctrl.noFinalRelease = true; } loadAccessWays(id); @@ -141,13 +141,13 @@ } // get project for embargo warning display - var id = ProjectReleaseService.stripVersionSuffix( + var strippedId = ProjectReleaseService.stripVersionSuffix( $ctrl.dataPackage.dataAcquisitionProjectId ); var projectQuery = dataAcquisitionProjectSearchService.createSearchQueryForProjectsById( "dataPackages", false, //all projects - id, + strippedId, null); ElasticSearchClient.search(projectQuery).then(function(results) { if (results.hits.hits.length === 1) { @@ -180,15 +180,14 @@ // disable ordering in case of pre-release $ctrl.isPreReleased = true; } - // get project for embargo warning display - var id = ProjectReleaseService.stripVersionSuffix( + var strippedId = ProjectReleaseService.stripVersionSuffix( $ctrl.dataPackage.dataAcquisitionProjectId ); var projectQuery = dataAcquisitionProjectSearchService.createSearchQueryForProjectsById( "dataPackages", false, //all projects - id, + strippedId, null); ElasticSearchClient.search(projectQuery).then(function(results) { if (results.hits.hits.length === 1) { diff --git a/mdm-frontend/src/app/legacy/ordermanagement/components/data-package-configurator.html.tmpl b/mdm-frontend/src/app/legacy/ordermanagement/components/data-package-configurator.html.tmpl index 9aad9c8261..830ccead60 100644 --- a/mdm-frontend/src/app/legacy/ordermanagement/components/data-package-configurator.html.tmpl +++ b/mdm-frontend/src/app/legacy/ordermanagement/components/data-package-configurator.html.tmpl @@ -76,7 +76,7 @@ {{'shopping-cart.buttons.add-data-package-tooltip' | translate}}