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 2014/01/16 00:32:28 UTC
svn commit: r1558609 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-webapp/src/m...
Author: olamy
Date: Wed Jan 15 23:32:28 2014
New Revision: 1558609
URL: http://svn.apache.org/r1558609
Log:
fixing browsing with typeahead
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java?rev=1558609&r1=1558608&r2=1558609&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java Wed Jan 15 23:32:28 2014
@@ -34,6 +34,16 @@ public class BrowseResultEntry
private boolean project;
+ /**
+ * @since 2.0.0
+ */
+ private String groupId;
+
+ /**
+ * @since 2.0.0
+ */
+ private String artifactId;
+
public BrowseResultEntry()
{
// no op
@@ -70,13 +80,46 @@ public class BrowseResultEntry
return this.name.compareTo( browseGroupResultEntry.name );
}
+ public String getGroupId()
+ {
+ return groupId;
+ }
+
+ public void setGroupId( String groupId )
+ {
+ this.groupId = groupId;
+ }
+
+ public BrowseResultEntry groupId( String groupId )
+ {
+ this.groupId = groupId;
+ return this;
+ }
+
+ public String getArtifactId()
+ {
+ return artifactId;
+ }
+
+ public void setArtifactId( String artifactId )
+ {
+ this.artifactId = artifactId;
+ }
+
+ public BrowseResultEntry artifactId( String artifactId )
+ {
+ this.artifactId = artifactId;
+ return this;
+ }
+
@Override
public String toString()
{
- final StringBuilder sb = new StringBuilder();
- sb.append( "BrowseResultEntry" );
- sb.append( "{name='" ).append( name ).append( '\'' );
+ final StringBuilder sb = new StringBuilder( "BrowseResultEntry{" );
+ sb.append( "name='" ).append( name ).append( '\'' );
sb.append( ", project=" ).append( project );
+ sb.append( ", groupId='" ).append( groupId ).append( '\'' );
+ sb.append( ", artifactId='" ).append( artifactId ).append( '\'' );
sb.append( '}' );
return sb.toString();
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1558609&r1=1558608&r2=1558609&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java Wed Jan 15 23:32:28 2014
@@ -195,11 +195,11 @@ public class DefaultBrowseService
new ArrayList<BrowseResultEntry>( namespaces.size() + projects.size() );
for ( String namespace : namespaces )
{
- browseGroupResultEntries.add( new BrowseResultEntry( namespace, false ) );
+ browseGroupResultEntries.add( new BrowseResultEntry( namespace, false ).groupId( namespace ) );
}
for ( String project : projects )
{
- browseGroupResultEntries.add( new BrowseResultEntry( groupId + '.' + project, true ) );
+ browseGroupResultEntries.add( new BrowseResultEntry( groupId + '.' + project, true ).groupId( groupId ).artifactId( project ) );
}
Collections.sort( browseGroupResultEntries );
return new BrowseResult( browseGroupResultEntries );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js?rev=1558609&r1=1558608&r2=1558609&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js Wed Jan 15 23:32:28 2014
@@ -1528,7 +1528,7 @@ define("archiva.search",["jquery","jquer
//window.sammyArchivaApplication.setLocation("#quicksearch~" + datum.artifactId);
if (datum.project){
- goToArtifactDetail(theGroupId,datum.name);
+ goToArtifactDetail(datum.groupId,datum.artifactId);
} else {
var selectedRepo=getSelectedBrowsingRepository();
var location ="#browse";
@@ -1677,15 +1677,17 @@ define("archiva.search",["jquery","jquer
if (data.browseResultEntries) {
return $.isArray(data.browseResultEntries) ?
$.map(data.browseResultEntries,function(item){
- return new BrowseResultEntry(item.name, item.project);
+ return new BrowseResultEntry(item.name, item.project,item.groupId,item.artifactId);
} ).sort(function(a, b){return a.name.localeCompare(b.name)}): [data.browseResultEntries];
}
return [];
}
- BrowseResultEntry=function(name,project){
+ BrowseResultEntry=function(name,project,groupId,artifactId){
this.name=name;
this.project=project;
+ this.groupId=groupId;
+ this.artifactId=artifactId;
}
BreadCrumbEntry=function(groupId,displayValue){