[open-ils-commits] [GIT] Evergreen ILS branch master updated. 160d864cff8c1018c694609721afd378963b7b0d

[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, master has been updated
       via  160d864cff8c1018c694609721afd378963b7b0d (commit)
       via  c06c26252f4d592bd7dc86437f68901981700635 (commit)
      from  31b58d1b8901f9233857d5958d1fe6d1e303382d (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 160d864cff8c1018c694609721afd378963b7b0d
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Thu May 23 13:24:04 2013 -0700

    LP1183553 (continued) - Fix applied filters
    
    The filter dialog kept the previous filter around and then joined the
    new one with it. This repairs that issue and applies the new filter
    options on subsequent loading.
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
index 6dd5b58..73f3509 100644
--- a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
+++ b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
@@ -108,7 +108,7 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) {
                                             {fmClass:self.fmClass, suppressFilterFields:self.suppressFilterFields})
 
                                         self.filterDialog.onApply = function(filter) {
-                                            self.cachedQuerySearch = dojo.mixin( filter, self.preFilterSearch );
+                                            self.cachedQuerySearch = filter;
                                             self.resetStore();
                                             self.loadAll(
                                                 dojo.mixin( { offset : 0 }, self.cachedQueryOpts ),

commit c06c26252f4d592bd7dc86437f68901981700635
Author: Steven Chan <schan at sitka.bclibraries.ca>
Date:   Thu May 23 13:24:04 2013 -0700

    LP1183553 - Default filter option for configuration screens
    
    In the staff client, the AutoGrid widget is used to render configuration
    lists, and by default, the setting 'showLoadFilter' is turned off.  It
    seems more useful to turn it on by default so that any configuration
    screen can use it unless its template sets it off.
    
    Signed-off-by: Steven Chan <schan at sitka.bclibraries.ca>
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
index ddc3e58..6dd5b58 100644
--- a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
+++ b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
@@ -32,7 +32,7 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) {
             displayOffset : 0,
             requiredFields : null,
             hidePaginator : false,
-            showLoadFilter : false,
+            showLoadFilter : true,
             onItemReceived : null,
             suppressLinkedFields : null, // list of fields whose linked display data should not be fetched from the server
 

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

Summary of changes:
 Open-ILS/web/js/dojo/openils/widget/AutoGrid.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS