wrong method name

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10907 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/build-db.sh b/Open-ILS/src/sql/Pg/build-db.sh
index 816ab74..06bd331 100755 (executable)
--- a/Open-ILS/src/sql/Pg/build-db.sh
+++ b/Open-ILS/src/sql/Pg/build-db.sh
@@ -15,7 +15,8 @@ export PGHOST PGPORT PGDATABASE PGUSER PGPASSWORD
 # ---------------------------------------------------------------------------
 # Lookup the database version from the PostgreSQL server.
 # ---------------------------------------------------------------------------
-DB_VERSION=`psql -qtc 'show server_version;' | xargs | cut -c1,3`
+#DB_VERSION=`psql -qtc 'show server_version;' | xargs | cut -c1,3`
+DB_VERSION=81
 if [ -z "$DB_VERSION" ] || [ `echo $DB_VERSION | grep -c '[^0-9]'` != 0 ]; then
   cat <<EOM
 ********************************************************************************

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 987dd2f..ebf71ca 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -1896,7 +1896,7 @@ circ.util.checkin_via_barcode = function(session,params,backdate,auto_print,asyn
                                        }
                                } catch(E) {
                                        JSAN.use('util.error'); var error = new util.error();
-                                       error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedMessage('staff.circ.checkin.error', ['1']), E);
+                                       error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.error', ['1']), E);
                                        if (typeof async == 'object') {
                                                try { async.enable_textbox(); }
                                                catch(E) { error.sdump('D_ERROR','async.disable_textbox() = ' + E); };
@@ -1935,7 +1935,7 @@ circ.util.checkin_via_barcode = function(session,params,backdate,auto_print,asyn
 
        } catch(E) {
                JSAN.use('util.error'); var error = new util.error();
-               error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedMessage('staff.circ.checkin.error', ['2']), E);
+               error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.error', ['2']), E);
                if (typeof async == 'object') {
                        try { async.enable_textbox(); } catch(E) { error.sdump('D_ERROR','async.disable_textbox() = ' + E); };
                }
@@ -2268,7 +2268,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                return check;
        } catch(E) {
                JSAN.use('util.error'); var error = new util.error();
-               error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedMessage('staff.circ.checkin.error', ['3']), E);
+               error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.error', ['3']), E);
                return null;
        }
 };
@@ -2313,7 +2313,7 @@ circ.util.renew_via_barcode = function ( barcode, patron_id, async ) {
                                return renew;
                        } catch(E) {
                                JSAN.use('util.error'); var error = new util.error();
-                               error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedMessage('staff.circ.checkin.renew_failed.error', [barcode]), E);
+                               error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.renew_failed.error', [barcode]), E);
                                return null;
                        }
                }