[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 69395e8c55db3a0993b2a48eb930ab55402d5c8d

[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  69395e8c55db3a0993b2a48eb930ab55402d5c8d (commit)
      from  510fdf7bdea8c8ad90b3209ac182840749185884 (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 69395e8c55db3a0993b2a48eb930ab55402d5c8d
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Fri May 20 02:40:24 2011 -0400

    When placing holds on a bib with monographic part, require selection of a specific part
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd
index b52813a..7a41e07 100644
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -609,6 +609,7 @@ We recommend that you remove this title from any bookbags it may have been added
 <!ENTITY common.hold.issuance "Issuance Hold">
 <!ENTITY common.hold.advanced "Advanced Hold Options">
 <!ENTITY common.hold.delivery "Please select a physical location where your hold can be delivered.">
+<!ENTITY common.hold.part_required "Please select a specific monographic part to hold.">
 <!ENTITY common.hold.checked_out "This item is already checked out.">
 <!ENTITY common.hold.checked_out.override "This item is already checked out.  Would you like to place the hold anyway?">
 <!ENTITY common.hold.exists "A hold already exists on the requested item.">
diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index 73514c1..2be3c39 100644
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -928,10 +928,15 @@ function holdsBuildHoldFromWindow() {
 	else
 		hold.email_notify(0);
 
-    var part = getSelectorVal($('holds_parts_selector'));
-    if(part) {
-        holdArgs.type = 'P';
-        holdArgs.part = part;
+    if(holdArgs.recordParts && holdArgs.recordParts.length) {
+        var part = getSelectorVal($('holds_parts_selector'));
+        if(part) {
+            holdArgs.type = 'P';
+            holdArgs.part = part;
+        } else {
+            alertId('holds_pick_part');
+            return;
+        }
     }
 
 	var target = holdArgs[holdTargetTypeMap[holdArgs.type]];
diff --git a/Open-ILS/web/opac/skin/default/xml/common/holds.xml b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
index 7d8712d..014ee24 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
@@ -234,6 +234,7 @@
 	<span class='hide_me' id='holds_explain_adv'>&holds.advanced_options;</span>
 
 	<span class='hide_me' id='holds_pick_good_org'>&common.hold.delivery;</span>
+	<span class='hide_me' id='holds_pick_part'>&common.hold.part_required;</span>
 
 	<span class='hide_me' id='hold_dup_exists'>&common.hold.exists;</span>
 	<span class='hide_me' id='hold_checked_out'>&common.hold.checked_out;</span>

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

Summary of changes:
 Open-ILS/web/opac/locale/en-US/opac.dtd            |    1 +
 Open-ILS/web/opac/skin/default/js/holds.js         |   13 +++++++++----
 .../web/opac/skin/default/xml/common/holds.xml     |    1 +
 3 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS