returning overridable copy-on-holds-shelf event on permit

git-svn-id: svn://svn.open-ils.org/ILS/trunk@6004 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/extras/ils_events.xml b/Open-ILS/src/extras/ils_events.xml
index da3634e..b3f5d20 100644 (file)
--- a/Open-ILS/src/extras/ils_events.xml
+++ b/Open-ILS/src/extras/ils_events.xml
@@ -597,12 +597,6 @@
        <event code='7008' textcode='MAX_RENEWALS_REACHED'>
                <desc xml:lang="en-US"> Circulation has no more renewals remaining </desc>
        </event>
-       <event code='7009' textcode='ROUTE_TO_COPY_LOCATION'>
-               <desc xml:lang="en-US"> 
-               A copy needs to be routed to a copy location.  The location
-               should be specified within the event with a 'location' key
-               </desc>
-       </event>
        <event code='7009' textcode='CIRC_CLAIMS_RETURNED'>
                <desc xml:lang="en-US"> Requested circulation is marked claims returned </desc>
        </event>
@@ -624,6 +618,16 @@
        <event code='7015' textcode='NEGATIVE_PATRON_BALANCE'>
                <desc xml:lang="en-US">This requested action would result in a negative patron balance</desc>
        </event>
+       <event code='7016' textcode='ITEM_ON_HOLDS_SHELF'>
+               <desc xml:lang="en-US">This requested item is currently on the holds shelf</desc>
+       </event>
+       <event code='7017' textcode='ROUTE_TO_COPY_LOCATION'>
+               <desc xml:lang="en-US"> 
+               A copy needs to be routed to a copy location.  The location
+               should be specified within the event with a 'location' key
+               </desc>
+       </event>
+
 
        <!-- ================================================================ -->
 

diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js b/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
index bd861f8..f29df8e 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
@@ -20,7 +20,10 @@ if( ! isTrue(isRenewal) ) {
        if(copyStatus != 'Available' && 
                copyStatus != 'On holds shelf' && copyStatus != 'Reshelving' ) {
                        result.events.push('COPY_NOT_AVAILABLE');
-       }
+       } 
+
+       if( copyStatus == 'On holds shelf' )
+                       result.events.push('ITEM_ON_HOLDS_SHELF');
 }