From e335ea9a37879f5a93927bce8864c4013daceee8 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 3 May 2006 21:47:23 +0000
Subject: [PATCH] updated alert handling

git-svn-id: svn://svn.open-ils.org/ILS/trunk@4062 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/skin/default/js/holds.js  |  2 +-
 Open-ILS/web/opac/skin/default/js/myopac.js | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index a64467b6a3..47f9f460f2 100644
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -29,7 +29,7 @@ function _holdsHandleStaff() {
 	var user = grabUserByBarcode( G.user.session, barcode );
 	var code = checkILSEvent(user);
 	if(code || !user) {
-		alertILSEvent(code, barcode);
+		alertILSEvent(user, barcode);
 		showCanvas();
 		return;
 	}
diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index d00e64dbf3..ec8e188186 100644
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -205,12 +205,9 @@ function myOPACRenewCirc(circid) {
 	req.send(true);
 	var res = req.result();
 
-	if(evt = checkILSEvent(res)) {
-		if( evt != 0 ) {
-			alert(evt);
-			alertILSEvent(evt);
-			return;
-		}
+	if(checkILSEvent(res)) {
+		alertILSEvent(res);
+		return;
 	}
 
 	alert($('myopac_renew_success').innerHTML);	
@@ -615,8 +612,9 @@ function myOPACUpdateUsername() {
 	if(req.result()) {
 
 		var evt;
-		if(evt = checkILSEvent(req.result())) {
-			alertILSEvent(evt);
+		var res = req.result();
+		if(evt = checkILSEvent(res)) {
+			alertILSEvent(res);
 			return;
 		}
 
@@ -749,7 +747,7 @@ function myOPACMakeBBPublished(bbid, hideme) {
 	var result = containerUpdate(bb);
 
 	var code = checkILSEvent(result);
-	if(code) { alertILSEvent(code); return; }
+	if(code) { alertILSEvent(result); return; }
 
 	if(result) alert($('myopac_bb_update_success').innerHTML);
 	myOPACShowBookbags(true);
@@ -761,7 +759,7 @@ function myOPACDeleteBookbag(id) {
 	if( confirm( $('myopac_delete_bookbag_warn').innerHTML ) ) {
 		var result = containerDelete(id);
 		var code = checkILSEvent(result);
-		if(code) { alertILSEvent(code); return; }
+		if(code) { alertILSEvent(result); return; }
 		hideMe($('myopac_bookbag_items_table'));
 		hideMe($('myopac_bookbag_items_name'));
 		hideMe($('myopac_bookbag_no_items'));
@@ -856,7 +854,7 @@ function myOPACCreateBookbag() {
 
 	var result = containerCreate( name, $('bb_public_yes').checked );
 	var code = checkILSEvent(result);
-	if(code) { alertILSEvent(code); return; }
+	if(code) { alertILSEvent(result); return; }
 	myOPACShowBookbags(true);
 }
 
-- 
2.43.2