[open-ils-commits] [GIT] Evergreen ILS branch rel_2_6 updated. c01db9bae8fbd89d377317e690734eea4f2f759e

[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_6 has been updated
       via  c01db9bae8fbd89d377317e690734eea4f2f759e (commit)
      from  9c96410715c779ac70d7c76ea9af1ddf6f96e5c7 (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 c01db9bae8fbd89d377317e690734eea4f2f759e
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Sep 9 10:38:40 2014 -0700

    LP#1359934: prevent error opening patron search form
    
    As a result of the patch for OpenSRF bug 1316245, JSON2js
    in the OpenSRF library is now stricter -- in particular, passing
    an undefined value to it results in an exception being thrown.
    
    This patch runs with the increased strictness and fixes an
    issue where the patron search form was passing an undefined value
    to JSON2js.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/patron/search_form.js b/Open-ILS/xul/staff_client/server/patron/search_form.js
index 5fadf55..e62efa0 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form.js
+++ b/Open-ILS/xul/staff_client/server/patron/search_form.js
@@ -19,7 +19,9 @@ patron.search_form.prototype = {
         // But we're going to let search_limit and search_sort be configurable now by those spawning this interface, and let's assume there are no corresponding widgets for now.  
         // I'm going to place them into the "obj" scope for this instance.
         obj.search_limit = params.query.search_limit;
-        obj.search_sort = JSON2js( params.query.search_sort ); // Let's assume this is encoded as JSON
+        obj.search_sort = (typeof params.query.search_sort === 'undefined') ?
+                            null :
+                            JSON2js( params.query.search_sort ); // Let's assume this is encoded as JSON
 
         JSAN.use('OpenILS.data'); this.OpenILS = {}; 
         obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});

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

Summary of changes:
 .../xul/staff_client/server/patron/search_form.js  |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS