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

[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  6ed30af500c4267932856ff4cab60dae931ac4aa (commit)
       via  1bf92156dffe56db4287d619ef5b3b777f09fbe7 (commit)
      from  3ef152fdcf964d2d63ac09db2c771286d01c5e1b (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 6ed30af500c4267932856ff4cab60dae931ac4aa
Merge: 1bf9215 3ef152f
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri May 20 11:30:18 2011 -0400

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


commit 1bf92156dffe56db4287d619ef5b3b777f09fbe7
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri May 20 11:27:53 2011 -0400

    Fix advanced receive bug in manage_items.js
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/xul/staff_client/server/serial/manage_items.js b/Open-ILS/xul/staff_client/server/serial/manage_items.js
index 1072ad4..c510848 100644
--- a/Open-ILS/xul/staff_client/server/serial/manage_items.js
+++ b/Open-ILS/xul/staff_client/server/serial/manage_items.js
@@ -346,8 +346,11 @@ serial.manage_items.prototype = {
                                         }
                                     );
 
+                                var mode = obj.mode;
+                                if (mode == 'advanced_receive') mode = 'receive';
+
                                 var method; var success_label;
-                                if (obj.mode == 'receive' || obj.mode == 'advanced_receive') {
+                                if (mode == 'receive') {
                                     method = 'open-ils.serial.receive_items';
                                     success_label = 'received';
                                 } else { // bind mode
@@ -407,7 +410,7 @@ serial.manage_items.prototype = {
                                         if (typeof call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution().id()] == 'undefined') {
                                             var default_cn = 'DEFAULT';
                                             // if they defined a *_call_number, honor it as the default
-                                            var preset_cn_id = item.stream().distribution()[obj.mode + '_call_number']();
+                                            var preset_cn_id = item.stream().distribution()[mode + '_call_number']();
                                             if (preset_cn_id) {
                                                 var preset_default_cn = obj.network.request(
                                                         'open-ils.pcrud',

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

Summary of changes:
 .../xul/staff_client/server/serial/manage_items.js |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS