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/03/16 15:02:51 UTC
svn commit: r1301526 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
Author: olamy
Date: Fri Mar 16 14:02:51 2012
New Revision: 1301526
URL: http://svn.apache.org/viewvc?rev=1301526&view=rev
Log:
display repository name rather than id
Modified:
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-js/src/main/webapp/js/archiva/templates/search.html
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=1301526&r1=1301525&r2=1301526&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 Fri Mar 16 14:02:51 2012
@@ -30,6 +30,7 @@ import org.apache.archiva.rest.api.model
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() );
+ }
}
//---------------------------
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1301526&r1=1301525&r2=1301526&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Fri Mar 16 14:02:51 2012
@@ -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