Fix the bad status dialog. The acp in the payload used to be fleshed
authorphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 20 Mar 2009 22:09:08 +0000 (22:09 +0000)
committerphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 20 Mar 2009 22:09:08 +0000 (22:09 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4_0@12637 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/xul/staff_client/server/circ/util.js

index 20aac5f..4cfa8ac 100644 (file)
@@ -1920,7 +1920,7 @@ circ.util.checkin_via_barcode = function(session,params,backdate,auto_print,asyn
                                ],
                                'text' : {
                                        '1203' : function(r) {
-                                               return r.payload.status().name();
+                                               return typeof r.payload.status() == 'object' ? r.payload.status().name() : data.hash.ccs[ r.payload.status() ].name();
                                        },
                                        '1234' : function(r) {
                                                return document.getElementById('circStrings').getString('staff.circ.utils.checkin.override.item_deposit_paid.warning');
@@ -2381,7 +2381,7 @@ circ.util.renew_via_barcode = function ( barcode, patron_id, async ) {
                                        '7002' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
                                        '7003' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
                                        '7004' : function(r) {
-                                               return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode.status', [barcode, r.payload.status().name()]);
+                                               return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode.status', [barcode, typeof r.payload.status() == 'object' ? r.payload.status().name() : obj.data.hash.ccs[ r.payload.status() ].name()]);
                                        },
                                        '7006' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
                                        '7007' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },