projects / evergreen / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6d747f9)
LP#1320048: remove last use of Date.W3CDTF() from closed dates editor
authorGalen Charlton <gmc@esilibrary.com>
Fri, 16 May 2014 17:35:01 +0000 (10:35 -0700)
committerJason Stephenson <jstephenson@mvlc.org>
Mon, 19 May 2014 12:55:17 +0000 (08:55 -0400)
To test, verify that the closed dates editor continues to
function normally, i.e.,

* single all-day closures can be added
* a multi-day closing can be added
* one can set a "detailed closing" with a custom start
  time and end time
* existing closures are display properly

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Open-ILS/xul/staff_client/server/admin/closed_dates.js patch | blob | history
Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml patch | blob | history

diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.js b/Open-ILS/xul/staff_client/server/admin/closed_dates.js
index 45a9a6a..e5ee4a8 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.js
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.js
@@ -275,7 +275,7 @@ function cdVerifyTime(t) {
 
 function cdDateStrToDate( str ) {
 
-    var date = new Date.W3CDTF();
+    var date = new Date();
     var data = str.split(/ /);
 
     var year = data[0];
@@ -396,8 +396,8 @@ function cdGetOrgList(org) {
 function cdCreateOne( org, start, end, note, refresh ) {
     var date = new aoucd();
 
-    date.close_start(start.getW3CDTF());
-    date.close_end(end.getW3CDTF());
+    date.close_start(util.date.formatted_date(start, '%{iso8601}'));
+    date.close_end(util.date.formatted_date(end, '%{iso8601}'));
     date.org_unit(org);
     date.reason(note);
 
diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
index 12032c3..c4e1bf0 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -10,6 +10,8 @@
 
     <head>
         <title>&staff.server.admin.closed_dates.title;</title>
+        <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js"></script>
+        <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/openils_dojo.js"></script>
         <script type='text/javascript' src='/opac/common/js/utils.js'> </script>
         <script type='text/javascript' src='/opac/common/js/config.js'> </script>
         <script type='text/javascript' src='/opac/common/js/CGI.js'> </script>
@@ -21,8 +23,8 @@
         <script type='text/javascript' src='/opac/common/js/org_utils.js'> </script>
         <script type='text/javascript' src='/opac/common/js/init.js'> </script>
         <script type='text/javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-        <script type='text/javascript' src='/opac/common/js/Date.W3CDTF.js'> </script>
         <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
+        <script type="text/javascript" src="/xul/server/main/constants.js" />
         <script type='text/javascript' src='adminlib.js'> </script>
         <script type='text/javascript' src='closed_dates.js'> </script>
 
Evergreen working repo (MassLNC)