[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. ceb2ac624bbfd0013aca41a72bb297c3b867e769

[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_0 has been updated
       via  ceb2ac624bbfd0013aca41a72bb297c3b867e769 (commit)
      from  7e282412eb10c4a25604fea6de739f9558fb6fe4 (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 ceb2ac624bbfd0013aca41a72bb297c3b867e769
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Jul 21 14:52:45 2011 -0400

    Correctly populate certain columns in the patron Messages interface
    
    When applying penalties, the csp's referenced by the ausp's are fleshed.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/patron/standing_penalties.js b/Open-ILS/xul/staff_client/server/patron/standing_penalties.js
index 1ddf2c4..79c628d 100644
--- a/Open-ILS/xul/staff_client/server/patron/standing_penalties.js
+++ b/Open-ILS/xul/staff_client/server/patron/standing_penalties.js
@@ -188,7 +188,9 @@ function generate_request_handler_for_penalty_apply(penalty,id) {
                     'row' : {
                         'my' : {
                             'ausp' : penalty,
-                            'csp' : data.hash.csp[ penalty.standing_penalty() ],
+                            'csp' : typeof penalty.standing_penalty() == 'object'
+                                ? penalty.standing_penalty()
+                                : data.hash.csp[ penalty.standing_penalty() ],
                             'au' : xulG.patron,
                         }
                     }

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

Summary of changes:
 .../server/patron/standing_penalties.js            |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS