little more fine tuning of the thaw date handling

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

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index b79e59d..bcb5893 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -717,7 +717,8 @@ function holdsBuildHoldFromWindow() {
         unHideMe($('hold_frozen_thaw_row'));
         thawDate = $('holds_frozen_thaw_input').value;
         if(thawDate) {
-            if(holdsVerifyThawDate(thawDate)) 
+            thawDate = holdsVerifyThawDate(thawDate); 
+            if(thawDate) 
                 hold.thaw_date(thawDate);
             else
                 return;
@@ -830,9 +831,9 @@ function holdsUpdate(hold, user) {
 
 /* verify that the thaw date is valid and after today */
 function holdsVerifyThawDate(dateString) {
-    if(Date.parseIso8601(dateString) && 
-            holdGreaterThanToday(dateString)) 
-        return dateString;
+    thawDate = Date.parseIso8601(dateString);
+    if(thawDate && holdGreaterThanToday(dateString)) 
+        return thawDate.iso8601Format('YMD', false, false, true);
     return null;
 }
 

diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index 1aabe82..4b042c0 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -1436,11 +1436,12 @@ function myopacDrawHoldThawDateForm() {
 
 function myopacApplyThawDate() {
     var dateString = $('myopac_holds_thaw_date_input').value;
-    if(dateString) 
+    if(dateString) {
         dateString = holdsVerifyThawDate(dateString);
         if(!dateString) return;
-    else
+    } else {
         dateString = null;
+    }
     myopacProcessHolds('freeze', dateString);
 }