[open-ils-commits] [GIT] Evergreen ILS branch master updated. 876660f25b3778f2bae7933c1ac6eed6df6050fb

[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  876660f25b3778f2bae7933c1ac6eed6df6050fb (commit)
       via  2f3fce507a4717ce970fc493c3d88ae0f2358b60 (commit)
       via  b45d350c1edd21a7819e5f323337c7e3867a58f5 (commit)
      from  cb5e48089e9cfe283a070c5309524cfa2c3ff122 (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 876660f25b3778f2bae7933c1ac6eed6df6050fb
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Tue Jun 20 12:34:06 2017 -0400

    LP#1244547: add release notes
    
    Since this feature is tiny, I'm starting a miscellaneous
    section for any other further tiny enhancements in the
    'Administration' section.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/docs/RELEASE_NOTES_NEXT/Administration/misc.adoc b/docs/RELEASE_NOTES_NEXT/Administration/misc.adoc
new file mode 100644
index 0000000..10c7949
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Administration/misc.adoc
@@ -0,0 +1,6 @@
+Miscellaneous Improvements
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ * If a filter is in effect in the Library Settings Editor,
+   changing the selected library now results in the filter
+   continuing to be applied.

commit 2f3fce507a4717ce970fc493c3d88ae0f2358b60
Author: Remington Steed <rjs7 at calvin.edu>
Date:   Wed Jun 14 12:43:39 2017 -0400

    LP#1244547 Fix reference to new isFiltered variable
    
    This commit completes the intention of the previous commit, which
    accidentally checked the isFiltered object instead of its value.
    
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
index 20bfff2..85a9ea8 100644
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
@@ -133,7 +133,7 @@ function osDraw(specific_setting) {
             names.push(key);
     }
     
-    if(dojo.byId('isFiltered') == 'true') {
+    if(dojo.byId('isFiltered').value == 'true') {
         osLimitSeen(dojo.byId('searchBox').value);
     } else {
         osDrawNames(names);

commit b45d350c1edd21a7819e5f323337c7e3867a58f5
Author: Adam Bowling <abowling at emeralddata.net>
Date:   Thu Jan 22 11:20:28 2015 -0500

    LP#1244547 Maintain Filter Settings on Library Settings Editor
    
    After applying a filter to the rows on the Library Settings
    Editor, and then selecting a different OU, the filter settings
    are not considered unless the user clicks the "Filter" button
    once again.
    
    This patch maintains the filter settings on the edior until
    the user clicks the "Clear Filter" button.
    
    Signed-off-by: Adam Bowling <abowling at emeralddata.net>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
index 92bf2ea..20bfff2 100644
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
@@ -133,7 +133,11 @@ function osDraw(specific_setting) {
             names.push(key);
     }
     
-    osDrawNames(names);
+    if(dojo.byId('isFiltered') == 'true') {
+        osLimitSeen(dojo.byId('searchBox').value);
+    } else {
+        osDrawNames(names);
+    }
 }
 
 /**
@@ -143,7 +147,8 @@ var osCurrentSearchTimeout;
 function osSearchChange() {
     if(osCurrentSearchTimeout != null)
         clearTimeout(osCurrentSearchTimeout);
-        
+
+    dojo.byId('isFiltered').value = 'true';
     osCurrentSearchTimeout = setTimeout("doSearch()", 500);
 }
 
@@ -193,6 +198,7 @@ function doSearch() {
 }
 
 function clearSearch() {
+    dojo.byId('isFiltered').value = 'false';
     if(dojo.byId('searchBox').value != '') { // Don't refresh on blank.
         dojo.byId('searchBox').value = '';
         doSearch();
diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
index 662bde0..da3f4ae 100644
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
@@ -85,6 +85,7 @@
                     
                     <form id='searchform' onSubmit='return doSearch()'>
                             <input type='text' dojoType='dijit.form.TextBox' id='searchBox' onkeypress='osSearchChange();' />
+                            <input type='hidden' dojoType='dijit.form.TextBox' id='isFiltered' value='false' />
                             <button type='submit' dojoType='dijit.form.Button'>&staff.server.admin.org_unit_settings.filter;</button>
                             <button dojoType='dijit.form.Button' onClick='clearSearch();'>&staff.server.admin.org_unit_settings.clear_filter;</button>
                     </form>

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

Summary of changes:
 .../staff_client/server/admin/org_unit_settings.js |   10 ++++++++--
 .../server/admin/org_unit_settings.xhtml           |    1 +
 docs/RELEASE_NOTES_NEXT/Administration/misc.adoc   |    6 ++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/misc.adoc


hooks/post-receive
-- 
Evergreen ILS