[open-ils-commits] r10907 - in trunk/Open-ILS: src/sql/Pg xul/staff_client/server/circ

[svn at svn.open-ils.org]

Author: phasefx
Date: 2008-10-25 09:31:59 -0400 (Sat, 25 Oct 2008)
New Revision: 10907

Modified:
   trunk/Open-ILS/src/sql/Pg/build-db.sh
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
Log:
wrong method name

Modified: trunk/Open-ILS/src/sql/Pg/build-db.sh
===================================================================
--- trunk/Open-ILS/src/sql/Pg/build-db.sh	2008-10-25 02:16:54 UTC (rev 10906)
+++ trunk/Open-ILS/src/sql/Pg/build-db.sh	2008-10-25 13:31:59 UTC (rev 10907)
@@ -15,7 +15,8 @@
 # ---------------------------------------------------------------------------
 # 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
 ********************************************************************************

Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2008-10-25 02:16:54 UTC (rev 10906)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2008-10-25 13:31:59 UTC (rev 10907)
@@ -1896,7 +1896,7 @@
 					}
 				} 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 @@
 
 	} 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 @@
 		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 @@
 				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;
 			}
 		}