[open-ils-commits] r15721 - in trunk/Open-ILS/web/js: dojo/openils ui/default/acq/common ui/default/conify/global/action/survey ui/default/conify/global/asset ui/default/conify/global/config (miker)

svn at svn.open-ils.org svn at svn.open-ils.org
Fri Mar 5 14:57:11 EST 2010


Author: miker
Date: 2010-03-05 14:57:06 -0500 (Fri, 05 Mar 2010)
New Revision: 15721

Modified:
   trunk/Open-ILS/web/js/dojo/openils/PermaCrud.js
   trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
   trunk/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js
   trunk/Open-ILS/web/js/ui/default/conify/global/asset/copy_location_order.js
   trunk/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js
Log:
complete the transition from delete() to eliminate()

Modified: trunk/Open-ILS/web/js/dojo/openils/PermaCrud.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/PermaCrud.js	2010-03-05 19:27:45 UTC (rev 15720)
+++ trunk/Open-ILS/web/js/dojo/openils/PermaCrud.js	2010-03-05 19:57:06 UTC (rev 15721)
@@ -323,13 +323,15 @@
             return obj_list;
         },
 
+	/* 
+	 * 'delete' is a reserved keyword in JavaScript and can't be used
+	 * in browsers like IE or Chrome, so we define a safe synonym
+     * NOTE: delete() is now removed -- use eliminate instead
+
         delete : function ( list, opts ) {
             return this._CUD( 'delete', list, opts );
         },
 
-	/* 
-	 * 'delete' is a reserved keyword in JavaScript and can't be used
-	 * in browsers like IE or Chrome, so we define a safe synonym
 	 */
         eliminate: function ( list, opts ) {
             return this._CUD( 'delete', list, opts );

Modified: trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js	2010-03-05 19:27:45 UTC (rev 15720)
+++ trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js	2010-03-05 19:57:06 UTC (rev 15721)
@@ -786,7 +786,7 @@
 
     this.deleteDfa = function(dfa) {
         if (dfa.id() > 0) { /* real */
-            this.pcrud.delete(
+            this.pcrud.eliminate(
                 dfa, {
                     "async": true,
                     "oncomplete": function() {

Modified: trunk/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js	2010-03-05 19:27:45 UTC (rev 15720)
+++ trunk/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js	2010-03-05 19:57:06 UTC (rev 15721)
@@ -152,7 +152,7 @@
     delQuestion.id(quesId);
     delQuestion.isdeleted(true);
     surveyBody.parentNode.removeChild(surveyBody);
-    return pcrud.delete(delQuestion);
+    return pcrud.eliminate(delQuestion);
 
 }
 
@@ -193,7 +193,7 @@
     var delAnswer = new asva();
     delAnswer.id(ansId);
     delAnswer.isdeleted(true);
-    return pcrud.delete(delAnswer);
+    return pcrud.eliminate(delAnswer);
   
 }
 function newAnswer(quesId, answerText, answerRow, surveyBody) {

Modified: trunk/Open-ILS/web/js/ui/default/conify/global/asset/copy_location_order.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/conify/global/asset/copy_location_order.js	2010-03-05 19:27:45 UTC (rev 15720)
+++ trunk/Open-ILS/web/js/ui/default/conify/global/asset/copy_location_order.js	2010-03-05 19:57:06 UTC (rev 15721)
@@ -86,7 +86,7 @@
 function deleteOrders(onload) {
     // delete the existing order entries in preparation for new ones
     var pcrud = new openils.PermaCrud({authtoken : user.authtoken});
-    pcrud.delete(
+    pcrud.eliminate(
         orders,
         {
             async : true,

Modified: trunk/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js	2010-03-05 19:27:45 UTC (rev 15720)
+++ trunk/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js	2010-03-05 19:57:06 UTC (rev 15721)
@@ -169,7 +169,7 @@
                         pcrud.create(newOnes, {
                             oncomplete : function() {
                                 if(delOnes.length) {
-                                    pcrud.delete(delOnes, {
+                                    pcrud.eliminate(delOnes, {
                                         oncomplete : function() {
                                             progressDialog.hide();
                                         }
@@ -180,7 +180,7 @@
                             }
                         });
                     } else {
-                        pcrud.delete(delOnes, {
+                        pcrud.eliminate(delOnes, {
                             oncomplete : function() {
                                 progressDialog.hide();
                             }



More information about the open-ils-commits mailing list