[open-ils-commits] r16718 - in trunk/Open-ILS/xul/staff_client/server: circ patron (phasefx)

svn at svn.open-ils.org svn at svn.open-ils.org
Mon Jun 14 16:20:36 EDT 2010


Author: phasefx
Date: 2010-06-14 16:20:31 -0400 (Mon, 14 Jun 2010)
New Revision: 16718

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
   trunk/Open-ILS/xul/staff_client/server/patron/holds.js
   trunk/Open-ILS/xul/staff_client/server/patron/items.js
Log:
the dojo code now behind the util.date iso8601 formatter neither needs nor likes us appending timestamps to dates like that

Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2010-06-14 17:07:38 UTC (rev 16717)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2010-06-14 20:20:31 UTC (rev 16718)
@@ -2225,7 +2225,7 @@
         if (backdate && (backdate == util.date.formatted_date(new Date(),'%Y-%m-%d')) ) backdate = null;
 
         //var params = { 'barcode' : barcode };
-        if (backdate) params.backdate = util.date.formatted_date(backdate + ' 00:00:00','%{iso8601}');
+        if (backdate) params.backdate = util.date.formatted_date(backdate,'%{iso8601}');
 
         if (typeof params.disable_textbox == 'function') {
             try { params.disable_textbox(); }

Modified: trunk/Open-ILS/xul/staff_client/server/patron/holds.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/holds.js	2010-06-14 17:07:38 UTC (rev 16717)
+++ trunk/Open-ILS/xul/staff_client/server/patron/holds.js	2010-06-14 20:20:31 UTC (rev 16718)
@@ -788,7 +788,7 @@
                                 if (thaw_date || thaw_date == '') {
                                     circ.util.batch_hold_update(
                                         hold_list, 
-                                        { 'frozen' : 't', 'thaw_date' : thaw_date == '' ? null : util.date.formatted_date(thaw_date + ' 00:00:00','%{iso8601}') }, 
+                                        { 'frozen' : 't', 'thaw_date' : thaw_date == '' ? null : util.date.formatted_date(thaw_date,'%{iso8601}') }, 
                                         { 'progressmeter' : progressmeter, 'oncomplete' :  function() { obj.clear_and_retrieve(true); } }
                                     );
                                 }
@@ -833,7 +833,7 @@
                                 if (expire_time || expire_time == '') {
                                     circ.util.batch_hold_update(
                                         hold_list, 
-                                        { 'expire_time' : expire_time == '' ? null : util.date.formatted_date(expire_time + ' 00:00:00','%{iso8601}') }, 
+                                        { 'expire_time' : expire_time == '' ? null : util.date.formatted_date(expire_time,'%{iso8601}') }, 
                                         { 'progressmeter' : progressmeter, 'oncomplete' :  function() { obj.clear_and_retrieve(true); } }
                                     );
                                 }

Modified: trunk/Open-ILS/xul/staff_client/server/patron/items.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/items.js	2010-06-14 17:07:38 UTC (rev 16717)
+++ trunk/Open-ILS/xul/staff_client/server/patron/items.js	2010-06-14 20:20:31 UTC (rev 16718)
@@ -533,7 +533,7 @@
             }
             //alert('backdate = ' + backdate);
             if (backdate) {
-                backdate = util.date.formatted_date(backdate + ' 00:00:00','%{iso8601}');
+                backdate = util.date.formatted_date(backdate,'%{iso8601}');
                 var barcodes = util.functional.map_list(retrieve_ids,function(o){return o.barcode;});
                 var do_not_move_these = {};
                 for (var i = 0; i < barcodes.length; i++) {



More information about the open-ils-commits mailing list