From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 26 Nov 2014 19:31:41 +0000 (-0500)
Subject: LP#1205072 A/T granularity UI sane default, honors case
X-Git-Tag: sprint4-merge-nov22~1465
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=54f7dba87aef41a13a592a91c219be10207a8bd9;p=working%2FEvergreen.git

LP#1205072 A/T granularity UI sane default, honors case

Present A/T granularity options as untranslated, lower-case strings to
match the crontab examples.  Also, honor alternate case variations for
granularity values so that "Daily" and "daily" are both seprate, valid
options.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Remington Steed <rjs7@calvin.edu>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
---

diff --git a/Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2 b/Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2
index 43dfaf8ed2..64e61c533c 100644
--- a/Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2
+++ b/Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2
@@ -5,11 +5,13 @@
 
 <div class='hidden'>
     <select dojoType='dijit.form.ComboBox' jsId='eventDefGranularity'>
-        <option value='hourly'>[% l('Hourly') %]</option>
-        <option value='daily'>[% l('Daily') %]</option>
-        <option value='weekly'>[% l('Weekly') %]</option>
-        <option value='monthly'>[% l('Monthly') %]</option>
-        <option value='yearly'>[% l('Yearly') %]</option>
+        <!-- Option strings are intentionally 
+             un-translated since they are codes, not labels.  -->
+        <option>hourly</option>
+        <option>daily</option>
+        <option>weekly</option>
+        <option>monthly</option>
+        <option>yearly</option>
     </select>
 </div>
 
diff --git a/Open-ILS/web/js/ui/default/conify/global/action_trigger/event_definition.js b/Open-ILS/web/js/ui/default/conify/global/action_trigger/event_definition.js
index 51b7da97d7..1100da44cc 100644
--- a/Open-ILS/web/js/ui/default/conify/global/action_trigger/event_definition.js
+++ b/Open-ILS/web/js/ui/default/conify/global/action_trigger/event_definition.js
@@ -15,6 +15,7 @@ var eventDef = null;
 
 function loadEventDef() { 
     eventDefGranularity.attr('value', null);
+    eventDefGranularity.ignoreCase = false;
     edGrid.overrideEditWidgets.granularity = eventDefGranularity;
     edGrid.overrideEditWidgets.granularity.shove = {"create": ""};
     edGrid.loadAll({order_by:{atevdef : 'name, owner, hook, reactor, delay'}});