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

[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  d560f167f5689675a4531bcf93842f908986b870 (commit)
       via  6a04ad689bd94f0cddf8ab86f250823d7181f9d5 (commit)
      from  623aeb0f51c9ae4bed3eaf9f34574132c8e73206 (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 d560f167f5689675a4531bcf93842f908986b870
Merge: 6a04ad6 623aeb0
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Thu May 26 11:08:21 2011 -0400

    Merge branch 'master' of git.evergreen-ils.org:Evergreen


commit 6a04ad689bd94f0cddf8ab86f250823d7181f9d5
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Thu May 26 10:53:42 2011 -0400

    Checking for 'twisty' leads to false negatives in Serial Control
    
    Since a tree can be opened with a double-click, we can't rely on 'twisty'
    being set to load the child data.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/xul/staff_client/server/serial/manage_dists.js b/Open-ILS/xul/staff_client/server/serial/manage_dists.js
index c1a5df0..9e02c1f 100644
--- a/Open-ILS/xul/staff_client/server/serial/manage_dists.js
+++ b/Open-ILS/xul/staff_client/server/serial/manage_dists.js
@@ -647,12 +647,10 @@ serial.manage_dists.prototype = {
             if (!sel_lists[row_type]) sel_lists[row_type] = [];
             sel_lists[row_type].push(id);
 
-            if (twisty) {
-                switch(row_type) {
-                    case 'aou' : obj.on_click_aou(id,twisty); break;
-                    case 'sdist' : obj.on_select_sdist(id,twisty); break;
-                    default: break;
-                }
+            switch(row_type) {
+                case 'aou' : obj.on_click_aou(id,twisty); break;
+                case 'sdist' : obj.on_select_sdist(id,twisty); break;
+                default: break;
             }
         }
 
diff --git a/Open-ILS/xul/staff_client/server/serial/manage_subs.js b/Open-ILS/xul/staff_client/server/serial/manage_subs.js
index 2ce4184..628ebbe 100644
--- a/Open-ILS/xul/staff_client/server/serial/manage_subs.js
+++ b/Open-ILS/xul/staff_client/server/serial/manage_subs.js
@@ -1117,12 +1117,10 @@ serial.manage_subs.prototype = {
             if (!sel_lists[row_type]) sel_lists[row_type] = [];
             sel_lists[row_type].push(id);
 
-            if (twisty) {
-                switch(row_type) {
-                    case 'aou' : obj.on_click_aou(id,twisty); break;
-                    case 'ssub' : obj.on_select_ssub(id,twisty); break;
-                    default: break;
-                }
+            switch(row_type) {
+                case 'aou' : obj.on_click_aou(id,twisty); break;
+                case 'ssub' : obj.on_select_ssub(id,twisty); break;
+                default: break;
             }
         }
 

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

Summary of changes:
 .../xul/staff_client/server/serial/manage_dists.js |   10 ++++------
 .../xul/staff_client/server/serial/manage_subs.js  |   10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Evergreen ILS