From 54b65bcb4d0d187ee1f72543b2b4570f2ff78cfb Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 20 Mar 2012 10:34:51 +0000 Subject: [PATCH] fix detail view for packaging and parent git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1302830 13f79535-47bb-0310-9956-ffa450edef68 --- .../rest/services/DefaultBrowseService.java | 19 ------------------- .../src/main/webapp/js/archiva/search.js | 1 + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java index 00bc52897..6889de8b6 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java @@ -300,25 +300,6 @@ public class DefaultBrowseService } } } - if ( versionMetadata == null ) - { - return null; - } - - MavenProjectFacet mavenFacet = new MavenProjectFacet(); - mavenFacet.setGroupId( groupId ); - mavenFacet.setArtifactId( artifactId ); - versionMetadata.addFacet( mavenFacet ); - MavenProjectFacet versionMetadataMavenFacet = - (MavenProjectFacet) versionMetadata.getFacet( MavenProjectFacet.FACET_ID ); - if ( versionMetadataMavenFacet != null ) - { - if ( mavenFacet.getPackaging() != null && !StringUtils.equalsIgnoreCase( mavenFacet.getPackaging(), - versionMetadataMavenFacet.getPackaging() ) ) - { - mavenFacet.setPackaging( null ); - } - } return versionMetadata; } diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js index f340e33bc..942efe0f3 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js @@ -185,6 +185,7 @@ $(function() { mainContent.find("#browse_breadcrumb" ).show(); mainContent.find("#browse_breadcrumb" ).html(mediumSpinnerImg()); var metadataUrl="restServices/archivaServices/browseService/projectVersionMetadata/"+encodeURIComponent(groupId)+"/"+encodeURIComponent(artifactId); + metadataUrl+="/"+encodeURIComponent(version); var selectedRepo=getSelectedBrowsingRepository(); if (selectedRepo){ metadataUrl+="?repositoryId="+encodeURIComponent(selectedRepo); -- 2.39.5