[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 39103c9a6997e8fda806a0f707e6f15ddd6aee04

[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  39103c9a6997e8fda806a0f707e6f15ddd6aee04 (commit)
      from  0c2112774a42c8371ae3c170f9926ff8a1c1fb1c (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 39103c9a6997e8fda806a0f707e6f15ddd6aee04
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Tue Sep 27 11:56:51 2011 -0400

    LP#860685 List Actions and Print List fix
    
    List Actions and Print List broken in Check In interface when not using "Fast
    Entry (Asynchronous)", due to the way we're using list.refresh_row.  This fixes
    the internal list state for tracking retrieved versus un-retrieved list rows.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js
index d4fff66..e8d3ef3 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.js
@@ -457,7 +457,8 @@ circ.checkin.prototype = {
                 if (typeof params.on_retrieve == 'function') params.on_retrieve(row);
                 obj.update_no_change_label(params.my_node,row);
                 var bill = row.my.mbts;
-                if (bill && document.getElementById('fine_tally')) {
+                if (bill && document.getElementById('fine_tally') && ! row.already_tallied) {
+                    params.row.already_tallied = true;
                     var amount = util.money.cents_as_dollars(
                         Number( util.money.dollars_float_to_cents_integer( document.getElementById('fine_tally').getAttribute('amount') ) ) 
                         + Number( util.money.dollars_float_to_cents_integer( bill.balance_owed() ) )
@@ -524,6 +525,7 @@ circ.checkin.prototype = {
                         } 
                     },
                     'to_top' : true,
+                    'flesh_immediately' : !async,
                     'on_append' : function(rparams) { obj.row_map[ rparams.unique_row_counter ] = rparams; },
                     'on_remove' : function(unique_row_counter) { delete obj.row_map[ unique_row_counter ]; }
             } );
@@ -610,6 +612,7 @@ circ.checkin.prototype = {
             }
             row_params['retrieve_id'] = retrieve_id;
             row_params['row'] =  {
+                'already_tallied' : false,
                 'my' : {
                     'circ' : checkin.circ,
                     'mbts' : checkin.circ ? checkin.circ.billable_transaction().summary() : null,

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

Summary of changes:
 Open-ILS/xul/staff_client/server/circ/checkin.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS