[open-ils-commits] [GIT] Evergreen ILS branch rel_2_6 updated. 811a85da9571288b87bb42a3d969a0b8af6410cc

[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_6 has been updated
       via  811a85da9571288b87bb42a3d969a0b8af6410cc (commit)
      from  2c5a3ed9a677b01216213585fa3a387c00898eff (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 811a85da9571288b87bb42a3d969a0b8af6410cc
Author: Michele Morgan <mmorgan at noblenet.org>
Date:   Wed Aug 27 15:25:24 2014 -0400

    lp949101 Hold Columns for Item Status
    
    Fixes display of hold columns in Item Status Holds/Transit tab.
    
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
index 0aa656f..2e82c0a 100644
--- a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
+++ b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
@@ -46,6 +46,19 @@ function my_init() {
         var columns = circ.util.transit_columns({});
         transit_list = new util.list('transit');
         transit_list.init( { 'columns' : columns });
+        
+        var columns = circ.util.hold_columns(
+        
+                { 
+                    'request_time' : { 'hidden' : true },
+                    'pickup_lib_shortname' : { 'hidden' : false },
+                    'hold_type' : { 'hidden' : false },
+                    'current_copy' : { 'hidden' : true },
+                    'capture_time' : { 'hidden' : true },
+                    'email_notify' : { 'hidden' : false },
+                    'phone_notify' : { 'hidden' : false },
+                } 
+            );
 
         hold_list = new util.list('hold');
         hold_list.init( { 'columns' : columns });
@@ -608,17 +621,6 @@ function load_item() {
             var better_fleshed_hold_blob = network.simple_request('FM_AHR_BLOB_RETRIEVE.authoritative',[ ses(), details.hold.id() ]);
             var status_robj = better_fleshed_hold_blob.status;
             JSAN.use('circ.util');
-            var columns = circ.util.hold_columns( 
-                { 
-                    'request_time' : { 'hidden' : false },
-                    'pickup_lib_shortname' : { 'hidden' : false },
-                    'hold_type' : { 'hidden' : true },
-                    'current_copy' : { 'hidden' : true },
-                    'capture_time' : { 'hidden' : true },
-                    'email_notify' : { 'hidden' : false },
-                    'phone_notify' : { 'hidden' : false },
-                } 
-            );
 
             hold_list.clear();
             hold_list.append( { 'row' : { 'my' : { 'ahr' : better_fleshed_hold_blob.hold, 'acp' : details.copy, 'status' : status_robj, } } });

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

Summary of changes:
 .../server/circ/alternate_copy_summary.js          |   24 ++++++++++---------
 1 files changed, 13 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Evergreen ILS