[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. d9760ee099c7eb23ab7fa8ed7c3d75278fd18860

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_1 has been updated
       via  d9760ee099c7eb23ab7fa8ed7c3d75278fd18860 (commit)
       via  42a4469a0a9c13d09a04adbe49ff48f835020245 (commit)
      from  013b5ad589db41698c9a5986d30ba0beacfc939e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d9760ee099c7eb23ab7fa8ed7c3d75278fd18860
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Thu Feb 2 09:19:11 2012 -0500

    Use getItemType() instead of getForm() in searchBarInit().
    
    This seems to actually fix the problem with the item type limiter
    being lost when going from advanced search to the results page.
    
    Looks like the wrong method was being used to set the form_selector
    value in search_bar.js. It was being set to the web form itself and
    not to the value of the it (item type) parameter.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/opac/skin/default/js/search_bar.js b/Open-ILS/web/opac/skin/default/js/search_bar.js
index 1801edc..4585067 100644
--- a/Open-ILS/web/opac/skin/default/js/search_bar.js
+++ b/Open-ILS/web/opac/skin/default/js/search_bar.js
@@ -33,7 +33,7 @@ function searchBarInit() {
 	G.ui.searchbar.text.value = (getTerm() != null) ? getTerm() : "";
 	if (!isFrontPage) G.ui.searchbar.facets.value = (getFacet() != null) ? getFacet() : "";
 	setSelector(_ts,	getStype());
-	setSelector(_fs,	getForm());
+	setSelector(_fs,	getItemType());
 
 	depthSelInit();
 

commit 42a4469a0a9c13d09a04adbe49ff48f835020245
Author: Liam Whalen <lwhalen at evergreen-dev.catalogue.nrcan.gc.ca>
Date:   Tue Nov 1 14:18:32 2011 -0400

    When sorting a search results set the isFilterSort variable is passed
    to searchBarSubmit.  In side searchBarSumbit there is a call to the
    opac_utils.js function clearSearchParams function.  This removes all
    search paramaters when sorting a result set, which is not the desired
    effect.  I have wraped clearSearchParams in a check to make sure
    isFilterSort is not set before calling the clearSearchParams function,
    and this check ensures that the current search's paramaters are passed
    to sort operations.
    
    Signed-off-by: Liam Whalen <lwhalen at evergreen-dev.catalogue.nrcan.gc.ca>
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/opac/skin/default/js/search_bar.js b/Open-ILS/web/opac/skin/default/js/search_bar.js
index 76d123d..1801edc 100644
--- a/Open-ILS/web/opac/skin/default/js/search_bar.js
+++ b/Open-ILS/web/opac/skin/default/js/search_bar.js
@@ -54,7 +54,9 @@ function searchBarSubmit(isFilterSort) {
 	var text = G.ui.searchbar.text.value;
 	var facet_text = isFrontPage ? '' : G.ui.searchbar.facets.value;
 
-	clearSearchParams();
+    if (!isFilterSort) {	
+        clearSearchParams();
+    }
 
 	if(!text || text == "") return;
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/opac/skin/default/js/search_bar.js |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS