summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2014-01-15 23:32:07 +0000
committerOlivier Lamy <olamy@apache.org>2014-01-15 23:32:07 +0000
commit4f45ddf84ea02b6366818ea298a1bf9a77f3d6be (patch)
tree06346012550e4bb91b545b7258edebbab0b7d173
parent1e53fcfae976ec75df39a64932f5ee5c2d63d4cc (diff)
downloadarchiva-4f45ddf84ea02b6366818ea298a1bf9a77f3d6be.tar.gz
archiva-4f45ddf84ea02b6366818ea298a1bf9a77f3d6be.zip
handle null groupId
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1558607 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js2
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js6
2 files changed, 6 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
index c6cbbc694..e3e9d9b34 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
@@ -697,7 +697,7 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
if (groupId){
displayBrowseGroupId(groupId);
} else {
- displayBrowse(true);
+ displayBrowse(true,null);
}
});
this.get('#browse~:repositoryId/:groupId',function(context){
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
index f035b6f1c..8378fd7eb 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
@@ -1532,7 +1532,11 @@ define("archiva.search",["jquery","jquery.ui","i18n","jquery.tmpl","select2","kn
if (selectedRepo){
location+="~"+selectedRepo;
}
- location+="/"+theGroupId+"."+datum.name;
+ if(theGroupId){
+ location+="/"+theGroupId+"."+datum.name;
+ }else{
+ location+="/"+datum.name;
+ }
$.log("location:"+location);
window.sammyArchivaApplication.setLocation(location);
}