fix detail view for packaging and parent

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1302830 13f79535-47bb-0310-9956-ffa450edef68

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 00bc52897ed225305ce580516d14947538e56947..6889de8b651006b1a0d931c6461874313b6f7d9f 100644 (file)
--- 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 f340e33bced06d67c15b0d61705bd3628c01a4f8..942efe0f38a3692010602649943f305f02d993cd 100644 (file)
--- 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);