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

[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  c0a3be41982ade814597ea3f258e3e19821ff95d (commit)
      from  8f4f548ad2c13ca62e3a8906a701ceb02b4cabfc (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 c0a3be41982ade814597ea3f258e3e19821ff95d
Author: Mike Rylander <mrylander at gmail.com>
Date:   Tue May 22 08:00:12 2012 -0400

    Always display the hold type indicator
    
    We should be showing the type of hold on any pull-list or hold detail
    interface we build.  The primary use case is to alert staff when an
    alternate identical copy of the same title will (very likely) be usable
    by a hold, and (as in the case of C-like holds) it will not.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/web/opac/extras/circ/alt_holds_print.html b/Open-ILS/web/opac/extras/circ/alt_holds_print.html
index e1d2033..c3fc671 100644
--- a/Open-ILS/web/opac/extras/circ/alt_holds_print.html
+++ b/Open-ILS/web/opac/extras/circ/alt_holds_print.html
@@ -78,6 +78,7 @@
                 <tr>
                     <th only="shelf_expired_holds">Patron</th>
                     <th only="shelf_expired_holds">Action</th>
+                    <th>Type</th>
                     <th>Title</th>
                     <th>Author</th>
                     <th>Shelving Location</th>
@@ -91,6 +92,7 @@
                 <tr>
                     <td only="shelf_expired_holds">${usr.display_name}</td>
                     <td only="shelf_expired_holds">${action}</td>
+                    <td>${hold_type}</td>
                     <td type='opac/slot-data' query='datafield[tag=245]'></td>
                     <td type='opac/slot-data' query='datafield[tag^=1]' limit='1'> </td>
                     <td>${current_copy.location.name}</td>
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.js b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.js
index c13f0b2..9a9b742 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.js
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.js
@@ -87,6 +87,7 @@ function pullListDrawTitle( tbody, row, hold, idx, record ) {
 
 function pullListDrawCopy( tbody, row, hold, idx, copy ) {
 
+    $n(row, 'hold_type').appendChild(text(hold.hold_type()));
     $n(row, 'barcode').appendChild(text(copy.barcode()));
     $n(row, 'copy_location').appendChild(text(copy.location().name()));
     $n(row, 'copy_number').appendChild(text(copy.copy_number()));
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
index 0979ae4..ba4c68b 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
@@ -81,6 +81,7 @@
                         <td name='patron'/>
                         <td name='date'/>
                         <td>
+                            <span name='hold_type'></span> 
                             <span name='copy_hold' class='hide_me'>&staff.server.admin.hold_pull.copy_hold;</span>
                             <span name='volume_hold' class='hide_me'>&staff.server.admin.hold_pull.volume_hold;</span>
                             <span name='title_hold' class='hide_me'>&staff.server.admin.hold_pull.title_hold;</span>
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.js b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.js
index e3801db..18dc9e7 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.js
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.js
@@ -98,6 +98,7 @@ function pullListDrawTitle( tbody, row, hold, idx, record ) {
 
 function pullListDrawCopy( tbody, row, hold, idx, copy ) {
 
+    $n(row, 'hold_type').appendChild(text(hold.hold_type()));
     $n(row, 'barcode').appendChild(text(copy.barcode()));
     $n(row, 'copy_location').appendChild(text(copy.location().name()));
     $n(row, 'copy_number').appendChild(text(copy.copy_number()));
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
index 631e62e..510e721 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
@@ -55,7 +55,7 @@
 <span name='author'></span>
 <b>Copy:</b> <span name='copy_number'></span>   <b>Location:</b> <span name='copy_location'></span>   <b>Item ID:</b> <span name='barcode'></span>
 <b>Item Type:</b> <span name='item_type'><span name='format_at' class='hide_me'>Book               </span><span name='format_at-d' class='hide_me'>Large Print Book   </span><span name='format_i' class='hide_me'>Audiobook          </span><span name='format_g' class='hide_me'>Video Recording    </span><span name='format_j' class='hide_me'>Music              </span><span name='format_m' class='hide_me'>Electronic Resource</span></span>   <b>Patron ID:</b> <span name='patron'></span>
-<b>Requested:</b> <span name='date'></span>            <b>Hold Type:</b> <span name='copy_hold' class='hide_me'>Copy Hold</span><span name='volume_hold' class='hide_me'>Volume Hold</span><span name='title_hold' class='hide_me'>Title Hold</span><span name='mr_hold' class='hide_me'>Metarecord Hold</span>
+<b>Requested:</b> <span name='date'></span>            <b>Hold Type:</b> <span name='hold_type'></span> <span name='copy_hold' class='hide_me'>Copy Hold</span><span name='volume_hold' class='hide_me'>Volume Hold</span><span name='title_hold' class='hide_me'>Title Hold</span><span name='mr_hold' class='hide_me'>Metarecord Hold</span>
 <b>Pickup:</b> <span name='pickup'></span>            <span name="age_protect_span" class='hide_me'><b>Hold Protection:</b> <span name="age_protect"></span></span>
 </pre>
 </div>
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_details.js b/Open-ILS/xul/staff_client/server/patron/hold_details.js
index aaace8b..f35187d 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_details.js
+++ b/Open-ILS/xul/staff_client/server/patron/hold_details.js
@@ -109,6 +109,7 @@ function init_list() {
             'current_copy' : { 'hidden' : false },
             'phone_notify' : { 'hidden' : false },
             'email_notify' : { 'hidden' : false },
+            'hold_type' : { 'hidden' : false },
         } 
     );
     JSAN.use('util.list'); g.list = new util.list('holds_list');

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

Summary of changes:
 Open-ILS/web/opac/extras/circ/alt_holds_print.html |    2 ++
 .../staff_client/server/admin/hold_pull_list.js    |    1 +
 .../staff_client/server/admin/hold_pull_list.xhtml |    1 +
 .../server/admin/hold_pull_list_classic.js         |    1 +
 .../server/admin/hold_pull_list_classic.xhtml      |    2 +-
 .../xul/staff_client/server/patron/hold_details.js |    1 +
 6 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS