fix issue in hash calculation when changing repository while browsing

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

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 479b030e53b314959f977604d63f94ed0a1ddb20..fc9f3c43dd1c767906a5931d72c86f1d9b59dd74 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
@@ -61,11 +61,16 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
       // artifactId can contains .
       // value org.apache.aries/org.apache.aries.util
       // split this org.apache.maven and maven-archiver
-      var values = id.substring((self.groupId+'.').length,id.length);//.split(".");
-      $.log("displayProjectEntry:"+id+",groupId:"+self.groupId+",values:"+values);
+      var artifactId = id.substring((self.groupId+'.').length,id.length);//.split(".");
+      var selectedRepo=getSelectedBrowsingRepository();
 
-      displayArtifactDetail(self.groupId,values,self);
-      //window.sammyArchivaApplication.setLocation("#artifact/"+self.groupId+"/"+values);
+      var location ="#artifact";
+      if (selectedRepo){
+        location+="~"+selectedRepo;
+      }
+      location+="/"+self.groupId+"/"+artifactId;
+
+      window.sammyArchivaApplication.setLocation(location);
 
     }
 
@@ -752,7 +757,11 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
     var selectedRepository=getSelectedBrowsingRepository();
     // #browse~internal/org.apache.maven
     var currentHash=window.location.hash;
-    var newLocation = "#browse~"+selectedRepository+currentHash.substringAfterFirst("/");
+    var newLocation = "#browse";
+    if (selectedRepository){
+      newLocation+="~"+selectedRepository;
+    }
+    newLocation += currentHash.substringAfterFirst("/");
     // do we have extra path after repository ?
 
     $.log("changeBrowseRepository:"+newLocation);