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/01 23:12:35 UTC
svn commit: r1295939 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/
archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/ archiva...
Author: olamy
Date: Thu Mar 1 22:12:35 2012
New Revision: 1295939
URL: http://svn.apache.org/viewvc?rev=1295939&view=rev
Log:
display artifacts number found in the search result
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java?rev=1295939&r1=1295938&r2=1295939&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java Thu Mar 1 22:12:35 2012
@@ -94,8 +94,9 @@ public class DefaultRemoteRepositoryAdmi
{
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 )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1295939&r1=1295938&r2=1295939&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Thu Mar 1 22:12:35 2012
@@ -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();
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=1295939&r1=1295938&r2=1295939&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 Thu Mar 1 22:12:35 2012
@@ -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')}: ${resultViewModel.artifacts().length}
+ </blockquote>
+
+</script>
+
<script id="search-results-view-grid-tmpl" type="text/html">
<thead>
<tr>