You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/07/29 21:21:43 UTC
svn commit: r1366907 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
main.js search.js
Author: olamy
Date: Sun Jul 29 19:21:42 2012
New Revision: 1366907
URL: http://svn.apache.org/viewvc?rev=1366907&view=rev
Log:
add sammy route to be able to add repository id in url
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1366907&r1=1366906&r2=1366907&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Sun Jul 29 19:21:42 2012
@@ -187,8 +187,8 @@ function() {
// format groupId:artifactId org.apache.maven.plugins:maven-jar-plugin
// or groupId:artifactId:version org.apache.maven.plugins:maven-jar-plugin:2.3.1
this.get('#artifact/:groupId/:artifactId',function(context){
- var groupId= this.params['groupId'];
- var artifactId= this.params['artifactId'];
+ var groupId= this.params.groupId;
+ var artifactId= this.params.artifactId;
$.log("get #artifact:"+groupId+":"+artifactId);
goToBrowseArtifactDetail(groupId,artifactId);//,null,null);
return;
@@ -196,10 +196,10 @@ function() {
});
this.get('#artifact:repositoryId/:groupId/:artifactId/:version',function(context){
- var repositoryId = this.params['repositoryId'];
- var groupId= this.params['groupId'];
- var artifactId= this.params['artifactId'];
- var version= this.params['version'];
+ var repositoryId = this.params.repositoryId;
+ var groupId= this.params.groupId;
+ var artifactId= this.params.artifactId;
+ var version= this.params.version;
if(!version){
displayBrowseArtifactDetail(splitted[0],splitted[1]);//,null,null);
@@ -208,13 +208,28 @@ function() {
}
});
this.get('#browse/:groupId',function(context){
- var groupId = this.params['groupId'];
+ var groupId = this.params.groupId;
if (groupId){
displayBrowseGroupId(groupId);
} else {
displayBrowse(true);
}
});
+ this.get('#browse~:repositoryId/:groupId',function(context){
+ var groupId = this.params.groupId;
+ var repositoryId = this.params.repositoryId;
+ $.log("repositoryId:"+repositoryId);
+ if (groupId){
+ displayBrowseGroupId(groupId);
+ } else {
+ displayBrowse(true);
+ }
+ });
+ this.get('#browse~:repositoryId',function(context){
+ var repositoryId = this.params.repositoryId;
+ $.log("repositoryId:"+repositoryId);
+ displayBrowse(true,repositoryId);
+ });
this.get('#:folder', function () {
var folder = this.params.folder;
self.activeMenuId(folder);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1366907&r1=1366906&r2=1366907&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Sun Jul 29 19:21:42 2012
@@ -637,19 +637,21 @@ define("archiva.search",["jquery","i18n"
}
browseRoot=function(){
- /*var url="restServices/archivaServices/browseService/rootGroups";
var selectedRepo=getSelectedBrowsingRepository();
- if (selectedRepo){
- url+="?repositoryId="+encodeURIComponent(selectedRepo);
+
+ if(selectedRepo) {
+ window.sammyArchivaApplication.setLocation("#browse~"+selectedRepo);
+ } else {
+ window.sammyArchivaApplication.setLocation("#browse");
}
- displayGroupDetail(null,null,url);*/
- window.sammyArchivaApplication.setLocation("#browse");
}
/**
* call from menu entry to display root level
+ * @param freshView redisplay everything
+ * @param repositoryId if any repository selected
*/
- displayBrowse=function(freshView){
+ displayBrowse=function(freshView,repositoryId){
screenChange();
var mainContent = $("#main-content");
if(freshView){
@@ -663,8 +665,11 @@ define("archiva.search",["jquery","i18n"
type: "GET",
dataType: 'json',
success: function(data) {
- mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" ).tmpl({repositories:data,selected:""}));
- var url="restServices/archivaServices/browseService/rootGroups"
+ mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" ).tmpl({repositories:data,selected:repositoryId}));
+ var url="restServices/archivaServices/browseService/rootGroups";
+ if(repositoryId){
+ url+="?repositoryId="+repositoryId;
+ }
$.ajax(url, {
type: "GET",
dataType: 'json',
@@ -684,8 +689,9 @@ define("archiva.search",["jquery","i18n"
changeBrowseRepository=function(){
var selectedRepository=getSelectedBrowsingRepository();
- $.log("changeBrowseRepository:"+selectedRepository);
- displayGroupDetail(null,null,"restServices/archivaServices/browseService/rootGroups?repositoryId="+encodeURIComponent(selectedRepository));
+ //$.log("changeBrowseRepository:"+selectedRepository);
+ //displayGroupDetail(null,null,"restServices/archivaServices/browseService/rootGroups?repositoryId="+encodeURIComponent(selectedRepository));
+ window.sammyArchivaApplication.setLocation("#browse~"+selectedRepository);
}
getSelectedBrowsingRepository=function(){