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

[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  2f181e5acc7001cbf38dc0510bd9eeae35112a0e (commit)
       via  ace155abcb205352bb6e372aad9c21ed8bb95279 (commit)
      from  38de53539a7d7469eed976546d2ed060956b173f (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 2f181e5acc7001cbf38dc0510bd9eeae35112a0e
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Wed Oct 3 15:27:37 2012 -0400

    Include barcode in pre-cat confirm dialog
    
    This allows staff to see what was scanned into the field as part of
    the dialog window prior to confirming creating a pre-cat for it.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index 30dcec2..9b6089c 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -748,7 +748,7 @@ circ.checkout.prototype = {
                 if (test_event(permit,1202 /* ITEM_NOT_CATALOGED */)) {
 
                     if ( 1 == obj.error.yns_alert(
-                        document.getElementById('circStrings').getString('staff.circ.checkout.not_cataloged.confirm'),
+                        document.getElementById('circStrings').getFormattedString('staff.circ.checkout.not_cataloged.confirm', [params.barcode]),
                         document.getElementById('circStrings').getString('staff.circ.alert'),
                         document.getElementById('circStrings').getString('staff.circ.cancel'),
                         document.getElementById('circStrings').getString('staff.circ.pre_cataloged'),
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index 2acaf70..0cba799 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -49,7 +49,7 @@ staff.circ.checkout.override.confirm=Override Checkout Failure?
 staff.circ.checkout.override.item_deposit_required.warning=A billing for an Item Deposit will be added to the patron's account if this action is overrided.
 staff.circ.checkout.override.item_rental_fee_required.warning=A billing for an Item Rental Fee will be added to the patron's account if this action is overrided.
 staff.circ.checkout.override.will_auto=If overriden now, subsequent checkouts during this patron's session will auto-override this event.
-staff.circ.checkout.not_cataloged.confirm=Mis-scan or non-cataloged item.  Checkout as a pre-cataloged item?
+staff.circ.checkout.not_cataloged.confirm=Barcode %1$s was either mis-scanned or is a non-cataloged item.  Checkout as a pre-cataloged item?
 staff.circ.pre_cataloged=Pre-cataloged
 staff.circ.non_cataloged=Non-cataloged
 staff.circ.checkout.cancelled=Checkout cancelled

commit ace155abcb205352bb6e372aad9c21ed8bb95279
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Wed Oct 3 15:25:53 2012 -0400

    Reporter: Sort contents of remote selector widgets
    
    Simple sort based on the display value.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/web/reports/oils_rpt_widget.js b/Open-ILS/web/reports/oils_rpt_widget.js
index 7e644ec..28123d2 100644
--- a/Open-ILS/web/reports/oils_rpt_widget.js
+++ b/Open-ILS/web/reports/oils_rpt_widget.js
@@ -523,6 +523,14 @@ oilsRptRemoteWidget.prototype.draw = function() {
 }
 
 oilsRptRemoteWidget.prototype.render = function(objs) {
+	var selector = this.field.selector;
+	objs.sort(
+		function(a,b){
+			if (a[selector]() > b[selector]())
+				return 1;
+			else
+				return -1;
+		});
 	for( var i = 0; i < objs.length; i++ ) {
 		var obj = objs[i];
 		var label = obj[this.field.selector]();

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

Summary of changes:
 Open-ILS/web/reports/oils_rpt_widget.js            |    8 ++++++++
 Open-ILS/xul/staff_client/server/circ/checkout.js  |    2 +-
 .../server/locale/en-US/circ.properties            |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS