From fb986eb39f575a643f608eb7ab6fc7ca74a09e21 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 7 Aug 2012 21:22:32 +0000
Subject: [PATCH] fix navigation missing when using crumbentries

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1370531 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/js/archiva/search.js           | 14 +++++++++++---
 .../main/webapp/js/templates/archiva/search.html   |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

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 920b95ff5..c91aed12a 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
@@ -155,8 +155,6 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
     }
 
     displayArtifactVersionDetail=function(version){
-      //var artifactVersionDetailViewModel=new ArtifactVersionDetailViewModel(self.groupId,self.artifactId,version,getSelectedBrowsingRepository());
-      //artifactVersionDetailViewModel.display();
       var selectedRepo=getSelectedBrowsingRepository();
       var location ="#artifact";
       if (selectedRepo){
@@ -651,6 +649,17 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
 
   }
 
+  goToArtifactDetail=function(groupId,artifactId){
+    var selectedRepo=getSelectedBrowsingRepository();
+    var location ="#artifact";
+    if (selectedRepo){
+      location+="~"+selectedRepo;
+    }
+    location+="/"+groupId+"/"+artifactId;
+
+    window.sammyArchivaApplication.setLocation(location);
+  }
+
   /**
    *
    * @param groupId
@@ -1423,7 +1432,6 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
       location+="/"+artifact.groupId+"/"+artifact.artifactId+"/"+artifact.version;
 
       window.sammyArchivaApplication.setLocation(location);
-      //generalDisplayArtifactDetailsVersionView(artifact.groupId,artifact.artifactId,artifact.version,null);
     }
   }
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
index 118177a50..eb17a5896 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
@@ -74,7 +74,7 @@
           ${breadCrumbEntry.displayValue}
         {{else}}
           {{if breadCrumbEntry.artifact}}
-            <a href="#" data-bind="click: function(){displayArtifactDetail(breadCrumbEntry.groupId,breadCrumbEntry.artifactId,null,null)}">${breadCrumbEntry.displayValue}</a>
+            <a href="#" data-bind="click: function(){goToArtifactDetail(breadCrumbEntry.groupId,breadCrumbEntry.artifactId)}">${breadCrumbEntry.displayValue}</a>
           {{else}}
             <a href="#" data-bind="click: function(){displayGroupId(breadCrumbEntry.groupId)}">${breadCrumbEntry.displayValue}</a>
           {{/if}}
-- 
2.39.5