typo, and checkin handling

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

diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js
index 9417b57..36b08f1 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js
@@ -389,7 +389,7 @@ function my_actsc_list_callback(request) {
                if (!actsc_list) { throw('null result'); }
                if (actsc_list.length == 0) { throw('zero length result'); }
        } catch(E) {
-               alert('Login failed on asc_list: ' + js2JSON(E)); 
+               alert('Login failed on actsc_list: ' + js2JSON(E)); 
                if (!debug_ignore_auth_failures) {
                        enable_login_prompts(); return;
                }

diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/checkin.js b/Evergreen/staff_client/chrome/content/evergreen/circ/checkin.js
index 8f22d70..2e51dc5 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/circ/checkin.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/circ/checkin.js
@@ -58,10 +58,8 @@ function checkin_checkin_items_init(p) {
                                if (check.status == 0) {
                                        checkins.push( check );
                                        p.checkin_items.add_checkin_items( [ checkins.length - 1 ] );
-                               } else if (check.status < 0) {
-                                       s_alert( check.text );
-                               } else if (check.status > 0) {
-                                       s_alert( check.text );
+                               } else {
+                                       // should be handled already
                                }
 
                                tb.value = ''; tb.focus();

diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js
index cead88c..2615517 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js
@@ -66,7 +66,10 @@ function checkin_by_copy_barcode(barcode, f) {
                        [ mw.G.auth_ses[0], barcode ],
                        f
                )[0];
-               if (!f) sdump('D_CIRC_UTILS','check = ' + js2JSON(check) + '\n');
+               if (!f) {
+                       sdump('D_CIRC_UTILS','check = ' + js2JSON(check) + '\n');
+                       if (check.status != 0) s_alert('D_CHECKIN',check.text );
+               }
                return check;
        } catch(E) {
                sdump('D_ERROR',E);

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
index efb1bee..9cc38bb 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
@@ -171,7 +171,7 @@ function patron_display_patron_items_init(p) {
                                                try {
                                                        var idx = patron_items[i].getAttribute('record_id'); 
                                                        var copy = p._patron.checkouts()[ idx ].copy;
-                                                       alert( js2JSON(checkin_by_copy_barcode( copy.barcode() )) );
+                                                       checkin_by_copy_barcode( copy.barcode() );
                                                        p.refresh();
                                                } catch(E) {
                                                        alert(E);

diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
index b5c7b99..59ed83a 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/util/error.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
@@ -21,7 +21,7 @@ var sdump_levels = {
        'D_CLAM' : false,
        'D_PAGED_TREE' : false,
        'D_GRID_LIST' : false,
-       'D_HTML_TABLE' : true,
+       'D_HTML_TABLE' : false,
        'D_TAB' : false,
 
        'D_AUTH' : false,
@@ -39,9 +39,9 @@ var sdump_levels = {
        'D_PATRON_ITEMS' : false,
        'D_PATRON_CHECKOUT_ITEMS' : false,
        'D_PATRON_HOLDS' : false,
-       'D_PATRON_BILLS' : true,
+       'D_PATRON_BILLS' : false,
 
-       'D_CHECKIN' : false,
+       'D_CHECKIN' : true,
        'D_CHECKIN_ITEMS' : false,
 
        'D_CAT' : false,