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/04/04 00:18:21 UTC
svn commit: r1309178 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Author: olamy
Date: Tue Apr 3 22:18:21 2012
New Revision: 1309178
URL: http://svn.apache.org/viewvc?rev=1309178&view=rev
Log:
fix view of artifact with artifactId containing dot
Modified:
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/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=1309178&r1=1309177&r2=1309178&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 Tue Apr 3 22:18:21 2012
@@ -42,24 +42,23 @@ define("search",["jquery","i18n","jquery
}
}
+ breadCrumbEntries=function(){
+ // root level ?
+ if (!self.parentBrowseViewModel) return [];
+ return calculateBreadCrumbEntries(self.groupId);
+ }
+
displayProjectEntry=function(id){
+
// value org.apache.maven/maven-archiver
+ // artifactId can contains .
+ // value org.apache.aries/org.apache.aries.util
// split this org.apache.maven and maven-archiver
- var values = id.split(".");
- var groupId="";
- for (var i = 0;i<values.length-1;i++){
- groupId+=values[i];
- if (i<values.length-2)groupId+=".";
- }
- var artifactId=values[values.length-1];
- displayArtifactDetail(groupId,artifactId,self);
+ var values = id.substring((self.groupId+'.').length,id.length);//.split(".");
+ $.log("displayProjectEntry:"+id+",groupId:"+self.groupId+",values:"+values);
- }
+ displayArtifactDetail(self.groupId,values,self);
- breadCrumbEntries=function(){
- // root level ?
- if (!self.parentBrowseViewModel) return [];
- return calculateBreadCrumbEntries(self.groupId);
}
displayEntry=function(value){
@@ -109,7 +108,7 @@ define("search",["jquery","i18n","jquery
type: "GET",
dataType: 'json',
success: function(data) {
- var browseResultEntries = mapbrowseResultEntries(data);
+ var browseResultEntries = mapBrowseResultEntries(data);
var browseViewModel = new BrowseViewModel(browseResultEntries,parentBrowseViewModel,groupId);
ko.applyBindings(browseViewModel,browseBreadCrumb.get(0));
ko.applyBindings(browseViewModel,browseResult.get(0));
@@ -501,7 +500,7 @@ define("search",["jquery","i18n","jquery
type: "GET",
dataType: 'json',
success: function(data) {
- var browseResultEntries = mapbrowseResultEntries(data);
+ var browseResultEntries = mapBrowseResultEntries(data);
$.log("size:"+browseResultEntries.length);
var browseViewModel = new BrowseViewModel(browseResultEntries,null,null);
ko.applyBindings(browseViewModel,mainContent.find("#browse_breadcrumb").get(0));
@@ -546,7 +545,7 @@ define("search",["jquery","i18n","jquery
// try with rootGroups then filtered
$.get(url,
function(data) {
- var browseResultEntries = mapbrowseResultEntries(data);
+ var browseResultEntries = mapBrowseResultEntries(data);
var filetered = [];
for(var i=0;i<browseResultEntries.length;i++){
@@ -588,7 +587,7 @@ define("search",["jquery","i18n","jquery
}
$.get(browseUrl,
function(data) {
- var browseResultEntries = mapbrowseResultEntries(data);
+ var browseResultEntries = mapBrowseResultEntries(data);
if (dotEnd){
response(browseResultEntries);
} else {
@@ -667,8 +666,8 @@ define("search",["jquery","i18n","jquery
displayArtifactDetail(groupId,artifactId,null,null);
}
- mapbrowseResultEntries=function(data){
- $.log("mapbrowseResultEntries");
+ mapBrowseResultEntries=function(data){
+ $.log("mapBrowseResultEntries");
if (data.browseResultEntries) {
return $.isArray(data.browseResultEntries) ?
$.map(data.browseResultEntries,function(item){