Author: olamy
Date: Wed Feb 29 18:52:02 2012
New Revision: 1295215
URL: http://svn.apache.org/viewvc?rev=1295215&view=rev
Log:
add a button to restore original search results after have applying some
filtering
Modified:
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-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=1295215&r1=1295214&r2=1295215&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
Wed Feb 29 18:52:02 2012
@@ -724,7 +724,9 @@ $(function() {
advancedSearch=function(){
self.search("restServices/archivaServices/searchService/searchArtifacts");
}
-
+ removeFilter=function(){
+ self.resultViewModel.artifacts(self.resultViewModel.originalArtifacts);
+ }
this.search=function(url){
var mainContent=$("#main-content");
@@ -756,11 +758,13 @@ $(function() {
displayWarningMessage( $.i18n.prop("search.artifact.noresults"));
return;
} else {
+ self.resultViewModel.originalArtifacts=artifacts;
self.resultViewModel.artifacts(artifacts);
if (!searchResultsGrid.attr("data-bind")){
searchResultsGrid.attr("data-bind",
"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));
}
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=1295215&r1=1295214&r2=1295215&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
Wed Feb 29 18:52:02 2012
@@ -267,6 +267,8 @@
<div id="search-results" class="tab-pane">
+ <a href="#" class="btn btn-warning" data-bind="click: removeFilter"
id="remove-filter-id">remove filter</a>
+
<table class="table table-striped table-bordered"
id="search-results-grid">
</table>
<div id="search-results-view-grid-pagination"></div>
