From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 5 Apr 2011 17:06:09 +0000 (+0000)
Subject: improve the ability of PermaCrud callers to deal with errors not of the ils_event... 
X-Git-Url: http://git.equinoxoli.org/?p=evergreen-equinox.git;a=commitdiff_plain;h=bd8c1cc5c80e45a475a8ff5c132ae7c6be241668

improve the ability of PermaCrud callers to deal with errors not of the ils_event shape

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

diff --git a/Open-ILS/web/js/dojo/openils/PermaCrud.js b/Open-ILS/web/js/dojo/openils/PermaCrud.js
index e9f255b..eb67638 100644
--- a/Open-ILS/web/js/dojo/openils/PermaCrud.js
+++ b/Open-ILS/web/js/dojo/openils/PermaCrud.js
@@ -271,7 +271,8 @@ if(!dojo._hasResource["openils.PermaCrud"]) {
                                 params : [ _pcrud.auth() ],
                                 onerror : function (r) {
                                     _pcrud.disconnect();
-                                    throw 'Transaction commit error';
+                                    if (req._final_error) req._final_error(r)
+                                    else throw 'Transaction commit error';
                                 },      
                                 oncomplete : function (r) {
                                     var res = r.recv();
@@ -281,20 +282,22 @@ if(!dojo._hasResource["openils.PermaCrud"]) {
                                         _pcrud.disconnect();
                                     } else {
                                         _pcrud.disconnect();
-                                        throw 'Transaction commit error';
+                                        if (req._final_error) req._final_error(r)
+                                        else throw 'Transaction commit error';
                                     }
                                 },
                             }).send();
                         } else {
                             _pcrud.disconnect();
-                            throw '_CUD: Error creating, deleting or updating ' + js2JSON(obj);
+                            if (req._final_error) req._final_error(r)
+                            else throw '_CUD: Error creating, deleting or updating ' + js2JSON(obj);
                         }
                     };
 
                     req.onerror = function (r) {
-                        if (r._final_error) r._final_error(r);
                         _pcrud.disconnect();
-                        throw '_CUD: Error creating, deleting or updating ' + js2JSON(obj);
+                        if (r._final_error) r._final_error(r);
+                        else throw '_CUD: Error creating, deleting or updating ' + js2JSON(obj);
                     };
 
                 } else {
@@ -307,12 +310,13 @@ if(!dojo._hasResource["openils.PermaCrud"]) {
                             _CUD_recursive( r._obj_list, r._pos, r._final_complete );
                         } else {
                             _pcrud.disconnect();
-                            throw '_CUD: Error creating, deleting or updating ' + js2JSON(obj);
+                            if (r._final_error) r._final_error(r);
+                            else throw '_CUD: Error creating, deleting or updating ' + js2JSON(obj);
                         }
                     };
                     req.onerror = function (r) {
-                        if (r._final_error) r._final_error(r);
                         _pcrud.disconnect();
+                        if (r._final_error) r._final_error(r);
                         throw '_CUD: Error creating, deleting or updating ' + js2JSON(obj);
                     };
                 }