[open-ils-commits] [GIT] Evergreen ILS branch master updated. 23705b67c02f98650b17938e35b3280b825c2abc
Evergreen Git
git at git.evergreen-ils.org
Tue Mar 3 12:15:27 EST 2015
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, master has been updated
via 23705b67c02f98650b17938e35b3280b825c2abc (commit)
from 06ca57f3c603eedd8af38e3acf31791c64faa56b (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 23705b67c02f98650b17938e35b3280b825c2abc
Author: Dan Wells <dbw2 at calvin.edu>
Date: Tue Mar 3 12:11:35 2015 -0500
Revert LP#1205072
It was decided that these changes caused too much potential for
confusion, and would be better served by a simultaneous change to
making 'granularity' case insensitive. Pulling back for now.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/support-scripts/action_trigger_runner.pl.in b/Open-ILS/src/support-scripts/action_trigger_runner.pl.in
index e4e7ade..1c217bc 100755
--- a/Open-ILS/src/support-scripts/action_trigger_runner.pl.in
+++ b/Open-ILS/src/support-scripts/action_trigger_runner.pl.in
@@ -142,7 +142,7 @@ $0 : Create and process action/trigger events
# To batch create all events for a specific granularity and to send notices for all pending
# events with that same granularity.
- perl $0 --run-pending --granularity=hourly --process-hooks
+ perl $0 --run-pending --granularity=Hourly --process-hooks
HELP
}
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 278e148..43dfaf8 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,14 +5,11 @@
<div class='hidden'>
<select dojoType='dijit.form.ComboBox' jsId='eventDefGranularity'>
- <!-- Option strings are intentionally
- un-translated since they are codes, not labels. -->
- <option>hourly</option>
- <option>daily</option>
- <option>weekdays</option>
- <option>weekly</option>
- <option>monthly</option>
- <option>yearly</option>
+ <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>
</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 1100da4..51b7da9 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,7 +15,6 @@ 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'}});
diff --git a/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt b/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt
deleted file mode 100644
index 51f315c..0000000
--- a/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-==== Upgrade Notes ====
-
-The 'granularity' field in the staff client Action Trigger Event
-Definition configuration interface (Admin -> Local Administration ->
-Notifications / Action Triggers) is now case sensitive. Previously,
-entering, for example, 'hourly' would be automatically modified to
-'Hourly'. Now, 'hourly' and 'Hourly' are each valid, distinct values,
-and the form field now always provides the lowercase value.
-
-This is important because the granularity values configured on the
-server for processing action/trigger events are case sensitive as
-well. When upgrading, please check that your saved values match the
-values used in your crontab.
diff --git a/docs/admin/actiontriggers.txt b/docs/admin/actiontriggers.txt
index 94dcf11..7d125e7 100644
--- a/docs/admin/actiontriggers.txt
+++ b/docs/admin/actiontriggers.txt
@@ -37,7 +37,7 @@ Table 1: Action Trigger Event Definitions
| <<reactors, Reactor>> |Links the action trigger to the Reactor.
| <<validators, Validator>> |The subroutines receive the trigger environment as an argument (see the linked Name for the environment definition) and returns either _1_ if the validator is _true_ or _0_ if the validator returns _false_.
| Event Repeatability Delay |Allows events to be repeated after this delay interval.
-| Granularity |Used to group events by how often they should be run. Options are hourly, daily, weekdays, weekly, monthly, yearly, but you may also create new values.
+| Granularity |Used to group events by how often they should be run. Options are Hourly, Daily, Weekly, Monthly, Yearly, but you may also create new values.
|===============================================
@@ -241,5 +241,5 @@ perl action_trigger_runner.pl --hooks=checkout.due --process-hooks
pending events with that same granularity.
+
----
-perl action_trigger_runner.pl --run-pending --granularity=hourly --process-hooks
+perl action_trigger_runner.pl --run-pending --granularity=Hourly --process-hooks
----
-----------------------------------------------------------------------
Summary of changes:
.../support-scripts/action_trigger_runner.pl.in | 2 +-
.../global/action_trigger/event_definition.tt2 | 13 +++++--------
.../global/action_trigger/event_definition.js | 1 -
.../Administration/action-trigger-granularity.txt | 13 -------------
docs/admin/actiontriggers.txt | 4 ++--
5 files changed, 8 insertions(+), 25 deletions(-)
delete mode 100644 docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list