[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 60b44a83e4597ba2b9a45c654c0b59af316421ae

[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_1 has been updated
       via  60b44a83e4597ba2b9a45c654c0b59af316421ae (commit)
       via  71722c5b61cb3ca66f2b990a75289e5058a655f0 (commit)
      from  b30b18986ee32308eb4f619e13846e893184f0d1 (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 60b44a83e4597ba2b9a45c654c0b59af316421ae
Merge: 71722c5 b30b189
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri May 20 11:34:06 2011 -0400

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


commit 71722c5b61cb3ca66f2b990a75289e5058a655f0
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