From: Olivier Lamy <olamy@apache.org>
Date: Fri, 20 Jan 2012 13:23:33 +0000 (+0000)
Subject: fix snippet url
X-Git-Tag: archiva-1.4-M3~1533
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2d96427bd0fcc17c7a16442fe6f5f2753a6f169e;p=archiva.git

fix snippet url

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1233900 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/DefaultManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
index 3d18e730e..490a6f570 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
@@ -216,6 +216,7 @@ public class DefaultManagedRepositoriesService
 
         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" );
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
index a24c9ba68..5db7906fd 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
@@ -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(){
-           }
+          }
         }
       );
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
index 80502b6b3..66d3fa885 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
@@ -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