From e12e0e6f50cd67975347b49ac3bc3558716912bd Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 7 Aug 2012 18:13:32 +0000 Subject: [PATCH] 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 --- .../src/main/webapp/js/archiva/search.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 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 479b030e5..fc9f3c43d 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 @@ -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); -- 2.39.5