[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. 66fbdd3cf6f2c96091295c7a69436f5be415eb65

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_4 has been updated
       via  66fbdd3cf6f2c96091295c7a69436f5be415eb65 (commit)
      from  6f4d21cb3947510f8ad1aa28d8634cf1acf8e926 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 66fbdd3cf6f2c96091295c7a69436f5be415eb65
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Wed Jul 17 20:24:26 2013 +0300

    Validate date ranges in Close Dates editor
    
    Complain in Closed Dates Editor when ending date is earlier than starting date.
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index d52ae78..f430bde 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2011,6 +2011,7 @@
 <!ENTITY staff.server.admin.closed_dates.confirm_delete "Are you sure you wish to delete the selected close date?">
 <!ENTITY staff.server.admin.closed_dates.date.invalid "Invalid date format">
 <!ENTITY staff.server.admin.closed_dates.time.invalid "Invalid time format">
+<!ENTITY staff.server.admin.closed_dates.date_span.invalid "Ending date is earlier than starting date">
 <!ENTITY staff.server.admin.closed_dates.success "Closed date successfully updated">
 <!ENTITY staff.server.admin.copy_locations.title "Evergreen: Copy Locations Editor">
 <!ENTITY staff.server.admin.copy_locations.editor " Copy Locations Editor ">
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 09c78bb..d784ff6 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.js
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.js
@@ -357,6 +357,11 @@ function cdNew() {
         end = cdDateStrToDate(edate + ' ' + etime);
     }
 
+    if (end.getTime() < start.getTime()) {
+        alertId('cd_invalid_date_span');
+        return;
+    }
+
     cdCreate(start, end, $('cd_edit_note').value);
 }
 
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 23299c1..c831f7d 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -225,6 +225,7 @@
             <span class='hide_me' id='cd_invalid_date'>&staff.server.admin.closed_dates.date.invalid;</span>
             <span class='hide_me' id='cd_invalid_time'>&staff.server.admin.closed_dates.time.invalid;</span>
             <span class='hide_me' id='cd_update_success'>&staff.server.admin.closed_dates.success;</span>
+            <span class='hide_me' id='cd_invalid_date_span'>&staff.server.admin.closed_dates.date_span.invalid;</span>
         
         </center>
     </body>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/opac/locale/en-US/lang.dtd            |    1 +
 .../xul/staff_client/server/admin/closed_dates.js  |    5 +++++
 .../staff_client/server/admin/closed_dates.xhtml   |    1 +
 3 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS