Author: olamy
Date: Fri Jan 20 13:23:33 2012
New Revision: 1233900
URL: http://svn.apache.org/viewvc?rev=1233900&view=rev
Log:
fix snippet url
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.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/DefaultManagedRepositoriesService.java?rev=1233900&r1=1233899&r2=1233900&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
Fri Jan 20 13:23:33 2012
@@ -216,6 +216,7 @@ public class DefaultManagedRepositoriesS
snippet.append( " <" ).append( distRepoName ).append( ">\n" );
snippet.append( " <id>" ).append( repo.getId() ).append(
"</id>\n" );
+ snippet.append( " <url>" );
snippet.append( getBaseUrl( httpServletRequest ) + "repository" );
snippet.append( "/" ).append( repo.getId() ).append( "/" ).append(
"</url>\n" );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1233900&r1=1233899&r2=1233900&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Fri Jan 20 13:23:33 2012
@@ -366,16 +366,14 @@ $(function() {
showPomSnippet=function(managedRepository){
-
+ $("#managed-repositories-pom-snippet").html(mediumSpinnerImg());
+ $('#managed-repositories-pom-snippet').show();
var url =
"restServices/archivaServices/managedRepositoriesService/getPomSnippet/"+managedRepository.id();
$.ajax(url,
{
type: "GET",
dataType: 'text',
success: function(data) {
- //var snippet='<div class="page-header">';
- //snippet +="<h2>POM Snippet</h2></div>";
-
//$("#managed-repositories-pom-snippet").html(snippet+"<pre>"+data+"</pre>");
$("#managed-repositories-pom-snippet").html($("#pom-snippet-tmpl").tmpl(data));
},
error: function(data) {
@@ -383,7 +381,7 @@ $(function() {
displayRestError(res);
},
complete: function(){
- }
+ }
}
);
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html?rev=1233900&r1=1233899&r2=1233900&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
Fri Jan 20 13:23:33 2012
@@ -266,7 +266,9 @@
</div>
</script>
<script id="pom-snippet-tmpl" type='text/x-jquery-tmpl'>
- <div class="page-header">
+ <div class="page-header">
<h2>POM Snippet</h2></div>
- <pre>${$data}</pre>
+ </div>
+ <div><a href="#"
onclick="$('#managed-repositories-pom-snippet').effect('blind')">${$.i18n.prop('hide')}</a></div>
+ <pre>${$data}</pre>
</script>
\ No newline at end of file
