display repository name rather than id

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1301526 13f79535-47bb-0310-9956-ffa450edef68

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 11ed250ac7e47227990c818fe01898340e73571c..d55771eaa282abefcf1866d1f2bfde04ad26ca31 100644 (file)
--- 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<ManagedRepository> 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 8c742fd04ad92938dab84e75e4b029859c43bf91..4305e005728d9346932628f0e1e684b8f9582e22 100644 (file)
--- 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 @@
 <script id="selected_repository_tmpl" type="text/html">
   <select id="repository">
     {{each(i,repository) repositories}}
-    <option value="${repository}">${repository}</option>
+    <option value="${repository.id}">${repository.name}</option>
     {{/each}}
   </select>
 </script>
\ No newline at end of file