Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix browse for directories 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1293946 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-02-26 22:12:25 +00:00
parent 9ea612361f
commit a294aff1b7
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/BrowseService.java
View File

@ -39,28 +39,28 @@ public interface BrowseService
@Path( "rootGroups" ) @Path( "rootGroups" )
@GET @GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( noRestriction = true, noPermission = false ) @RedbackAuthorization( noPermission = true, noRestriction = true )
BrowseResult getRootGroups() BrowseResult getRootGroups()
throws ArchivaRestServiceException; throws ArchivaRestServiceException;
@Path( "browseGroupId/{groupId}" ) @Path( "browseGroupId/{groupId}" )
@GET @GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( noRestriction = true, noPermission = false ) @RedbackAuthorization( noPermission = true, noRestriction = true )
BrowseResult browseGroupId( @PathParam( "groupId" ) String groupId ) BrowseResult browseGroupId( @PathParam( "groupId" ) String groupId )
throws ArchivaRestServiceException; throws ArchivaRestServiceException;
@Path( "versionsList/{g}/{a}" ) @Path( "versionsList/{g}/{a}" )
@GET @GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( noRestriction = true, noPermission = false ) @RedbackAuthorization( noPermission = true, noRestriction = true )
VersionsList getVersionsList( @PathParam( "g" ) String groupId, @PathParam( "a" ) String artifactId ) VersionsList getVersionsList( @PathParam( "g" ) String groupId, @PathParam( "a" ) String artifactId )
throws ArchivaRestServiceException; throws ArchivaRestServiceException;
@Path( "projectVersionMetadata/{g}/{a}" ) @Path( "projectVersionMetadata/{g}/{a}" )
@GET @GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( noRestriction = true, noPermission = false ) @RedbackAuthorization( noPermission = true, noRestriction = true )
ProjectVersionMetadata getProjectVersionMetadata( @PathParam( "g" ) String groupId, ProjectVersionMetadata getProjectVersionMetadata( @PathParam( "g" ) String groupId,
@PathParam( "a" ) String artifactId ) @PathParam( "a" ) String artifactId )
throws ArchivaRestServiceException; throws ArchivaRestServiceException;

1
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
View File

@ -129,7 +129,6 @@ $(function() {
} }
displayArtifactDetail=function(groupId,artifactId,parentBrowseViewModel,restUrl){ displayArtifactDetail=function(groupId,artifactId,parentBrowseViewModel,restUrl){
$.log("displayArtifactDetail:"+groupId+":"+artifactId);
var artifactDetailViewModel=new ArtifactDetailViewModel(groupId,artifactId); var artifactDetailViewModel=new ArtifactDetailViewModel(groupId,artifactId);
var mainContent = $("#main-content"); var mainContent = $("#main-content");
mainContent.find("#browse_result").hide(); mainContent.find("#browse_result").hide();

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
View File

@ -48,7 +48,7 @@
</li> </li>
{{/if}} {{/if}}
{{each(i,browseResultEntry) browseResultEntries}} {{each(i,browseResultEntry) browseResultEntries}}
{{if browseResultEntry.project}} {{if browseResultEntry.project=='true'}}
<li class="browse-list-project" title="artifact" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}"> <li class="browse-list-project" title="artifact" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">
{{else}} {{else}}
<li class="browse-list" data-bind="click:function(){displayGroupId(browseResultEntry.name)}"> <li class="browse-list" data-bind="click:function(){displayGroupId(browseResultEntry.name)}">