From: Olivier Lamy <olamy@apache.org>
Date: Thu, 1 Mar 2012 22:12:35 +0000 (+0000)
Subject: display artifacts number found in the search result
X-Git-Tag: archiva-1.4-M3~1144
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=378c3365aa8ef4331102f5894bbd006f7d6241e9;p=archiva.git

display artifacts number found in the search result

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

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
index bc887ea32..d20c4762a 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
@@ -94,8 +94,9 @@ public class DefaultRemoteRepositoryAdmin
     {
         try
         {
+            List<RemoteRepository> remoteRepositories = getRemoteRepositories();
             // close index on shutdown
-            for ( RemoteRepository remoteRepository : getRemoteRepositories() )
+            for ( RemoteRepository remoteRepository : remoteRepositories )
             {
                 IndexingContext context = indexer.getIndexingContexts().get( remoteRepository.getId() );
                 if ( context != null )
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index 3803b1e6c..7adbee42e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -766,6 +766,9 @@ $(function() {
                                  "simpleGrid: gridViewModel,simpleGridTemplate:'search-results-view-grid-tmpl',pageLinksId:'search-results-view-grid-pagination'");
                 ko.applyBindings(self.resultViewModel,searchResultsGrid.get(0));
                 ko.applyBindings(self,mainContent.find("#remove-filter-id" ).get(0));
+                mainContent.find("#search-result-number-div").attr("data-bind",
+                  "template:{name:'search-result-number-div-tmpl'}");
+                ko.applyBindings(self,mainContent.find("#search-result-number-div" ).get(0));
               }
 
               activateSearchResultsTab();
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 99cda9a87..acd9c5bf8 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
@@ -35,7 +35,6 @@
 
 <script id="browse-groups-div-tmpl" type="text/html">
   <div id="browse-groups-div" data-bind='template:{name:"browse-groups-tmpl"}'>
-
   </div>
 </script>
 
@@ -158,6 +157,7 @@
     <div id="search-artifacts-div" data-bind='template:{name:"search-artifacts-form-tmpl"}'>
     </div>
 </script>
+
 <script id="search-artifacts-form-tmpl" type="text/html">
 
   <div class="page-header">
@@ -267,8 +267,14 @@
 
 
       <div id="search-results" class="tab-pane">
-        <a href="#" class="btn btn-warning" data-bind="click: removeFilter" id="remove-filter-id">remove filter</a>
+        <div class="row">
+          <div class="span3">
+            <a href="#" class="btn btn-warning" data-bind="click: removeFilter" id="remove-filter-id">remove filter</a>
+          </div>
+          <div class="span4" id="search-result-number-div">
 
+          </div>
+        </div>
         <table class="table table-striped table-bordered" id="search-results-grid">
         </table>
         <div id="search-results-view-grid-pagination"></div>
@@ -280,6 +286,13 @@
 
 </script>
 
+<script type="text/html" id="search-result-number-div-tmpl">
+  <blockquote>
+      ${$.i18n.prop('search.artifact.result.size')}:&nbsp;${resultViewModel.artifacts().length}
+  </blockquote>
+
+</script>
+
 <script id="search-results-view-grid-tmpl" type="text/html">
     <thead>
         <tr>