From: Olivier Lamy <olamy@apache.org>
Date: Wed, 21 Mar 2012 15:04:33 +0000 (+0000)
Subject: take care of empty values and add i18n
X-Git-Tag: archiva-1.4-M3~987
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=15b9c6ddc2b30af2814a8fdc5d426f8a8561cb97;p=archiva.git

take care of empty values and add i18n

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

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index e31854a35..e449c2239 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -277,6 +277,8 @@ browse.artifact.mailingList.mainArchiveUrl=Main archive
 browse.artifact.mailingList.otherArchivesUrls=Other Archives
 browse.artifact.mailingList.unsubscribe=Unsubscribe
 browse.artifact.mailingList.subscribe=Subscribe
+browse.artifact.mailingList.none=No mailing lists found.
+browse.artifact.dependencies.none=No dependencies found.
 
 #login
 login.username.placehoder=Username
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 d70ce230c..5f75fc32c 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
@@ -572,6 +572,7 @@
   	  <div id="artifact-details-dependencies-content" class="tab-pane">
         <table class="table">
           <tbody>
+          {{if projectVersionMetadata.dependencies && projectVersionMetadata.dependencies.length>0}}
           {{each(i,dependency) projectVersionMetadata.dependencies}}
             <tr>
               <th>${dependency.artifactId}</th>
@@ -599,6 +600,9 @@
               </td>
             </tr>
           {{/each}}
+          {{else}}
+            ${$.i18n.prop('browse.artifact.dependencies.none')}
+          {{/if}}
           </tbody>
         </table>
   	  </div>
@@ -612,7 +616,7 @@
       </div>
 
       <div id="artifact-details-mailing-list-content" class="tab-pane">
-        {{if projectVersionMetadata.mailingLists}}
+        {{if projectVersionMetadata.mailingLists && projectVersionMetadata.mailingLists.length>0}}
           <div id="accordion_mailing_lists" class="accordion">
           {{each(i,mailingList) projectVersionMetadata.mailingLists}}
             <div class="accordion-group">
@@ -625,11 +629,27 @@
                 <div id="ml_collapse_${i}" class="accordion-body collapse">
               {{/if}}
                 <div class="accordion-inner">
-                  <div><b>${$.i18n.prop('browse.artifact.mailingList.subscribe')}</b>: <a href="mailto:${mailingList.subscribeAddress}">${mailingList.subscribeAddress}</a></div>
-                  <div><b>${$.i18n.prop('browse.artifact.mailingList.post')}</b>: <a href="mailto:${mailingList.postAddress}">${mailingList.postAddress}</a></div>
-                  <div><b>${$.i18n.prop('browse.artifact.mailingList.unsubscribe')}</b>: <a href="mailto:${mailingList.unsubscribeAddress}">${mailingList.unsubscribeAddress}</a></div>
-                  <div><b>${$.i18n.prop('browse.artifact.mailingList.mainArchiveUrl')}</b>: <a href="${mailingList.mainArchiveUrl}" target="_blank">${mailingList.mainArchiveUrl}</a></div>
-                  {{if mailingList.otherArchives}}
+                  {{if mailingList.subscribeAddress}}
+                  <div>
+                    <b>${$.i18n.prop('browse.artifact.mailingList.subscribe')}</b>: <a href="mailto:${mailingList.subscribeAddress}">${mailingList.subscribeAddress}</a>
+                  </div>
+                  {{/if}}
+                  {{if mailingList.postAddress}}
+                  <div>
+                    <b>${$.i18n.prop('browse.artifact.mailingList.post')}</b>: <a href="mailto:${mailingList.postAddress}">${mailingList.postAddress}</a>
+                  </div>
+                  {{/if}}
+                  {{if mailingList.unsubscribeAddress}}
+                  <div>
+                    <b>${$.i18n.prop('browse.artifact.mailingList.unsubscribe')}</b>: <a href="mailto:${mailingList.unsubscribeAddress}">${mailingList.unsubscribeAddress}</a>
+                  </div>
+                  {{/if}}
+                  {{if mailingList.mainArchiveUrl}}
+                  <div>
+                    <b>${$.i18n.prop('browse.artifact.mailingList.mainArchiveUrl')}</b>: <a href="${mailingList.mainArchiveUrl}" target="_blank">${mailingList.mainArchiveUrl}</a>
+                  </div>
+                  {{/if}}
+                  {{if mailingList.otherArchives && mailingList.otherArchives.length>0}}
                   <div>
                     <b>${$.i18n.prop('browse.artifact.mailingList.otherArchivesUrls')}:</b>
                     <ul>
@@ -644,6 +664,8 @@
             </div>
           {{/each}}
           </div>
+        {{else}}
+          ${$.i18n.prop('browse.artifact.mailingList.none')}
         {{/if}}
       </div>