From 2348ff4e62ca05ed33647929946edf1be8567a3c Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 16 Mar 2012 14:02:51 +0000 Subject: [PATCH] display repository name rather than id git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1301526 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/rest/services/DefaultBrowseService.java | 11 ++++++++++- .../src/main/webapp/js/archiva/templates/search.html | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java index 11ed250ac..d55771eaa 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java @@ -30,6 +30,7 @@ import org.apache.archiva.rest.api.model.BrowseResultEntry; import org.apache.archiva.rest.api.model.VersionsList; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.BrowseService; +import org.apache.archiva.security.ArchivaSecurityException; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; @@ -354,7 +355,15 @@ public class DefaultBrowseService public List getUserRepositories() throws ArchivaRestServiceException { - return userRepositories.getAccessibleRepositories( ) + try + { + return userRepositories.getAccessibleRepositories( getPrincipal() ); + } + catch ( ArchivaSecurityException e ) + { + throw new ArchivaRestServiceException( "repositories.read.observable.error", + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() ); + } } //--------------------------- diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html index 8c742fd04..4305e0057 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html @@ -383,7 +383,7 @@ \ No newline at end of file -- 2.39.5