[open-ils-commits] [GIT] Evergreen ILS branch master updated. 9ccc056d1e39cf7f99cc742734ce693b5bd573cd
Evergreen Git
git at git.evergreen-ils.org
Mon Mar 2 17:01:42 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 9ccc056d1e39cf7f99cc742734ce693b5bd573cd (commit)
via e0d9c5ccfc72ff067016e92a4d0950edd6d8e7ab (commit)
via 2f1754a5f794ad9e3da3acf87c0424219f928b09 (commit)
via 54f7dba87aef41a13a592a91c219be10207a8bd9 (commit)
from 74ddf23e5295de20ea3094cc65d6ce8a78114856 (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 9ccc056d1e39cf7f99cc742734ce693b5bd573cd
Author: Remington Steed <rjs7 at calvin.edu>
Date: Mon Mar 2 16:54:56 2015 -0500
LP#1205072: Correct and clarify the upgrade notes
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt b/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt
index 215e6c6..51f315c 100644
--- a/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt
+++ b/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt
@@ -4,8 +4,10 @@ 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.
+'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 granularitiy values configured on the
+This is important because the granularity values configured on the
server for processing action/trigger events are case sensitive as
-well.
+well. When upgrading, please check that your saved values match the
+values used in your crontab.
commit e0d9c5ccfc72ff067016e92a4d0950edd6d8e7ab
Author: Josh Stompro <stomproj at larl.org>
Date: Tue Jan 13 13:36:40 2015 -0600
LP#1205072 - Assorted fixes for action trigger granularity settings
- Added "weekdays" option to match up with example crontab file
- Change granularity example back to lowercase
- Change granularity labels to lowercase in the docs
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
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 1c217bc..e4e7ade 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 64e61c5..278e148 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
@@ -9,6 +9,7 @@
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>
diff --git a/docs/admin/actiontriggers.txt b/docs/admin/actiontriggers.txt
index 7d125e7..94dcf11 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, 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, weekdays, 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
----
commit 2f1754a5f794ad9e3da3acf87c0424219f928b09
Author: Bill Erickson <berickxx at gmail.com>
Date: Tue Dec 2 15:00:22 2014 -0500
LP#1205072 A/T granularity upgrade notes
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt b/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt
new file mode 100644
index 0000000..215e6c6
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Administration/action-trigger-granularity.txt
@@ -0,0 +1,11 @@
+==== 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.
+
+This is important because the granularitiy values configured on the
+server for processing action/trigger events are case sensitive as
+well.
commit 54f7dba87aef41a13a592a91c219be10207a8bd9
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Nov 26 14:31:41 2014 -0500
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 at gmail.com>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Dan Wells <dbw2 at 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 43dfaf8..64e61c5 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 51b7da9..1100da4 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'}});
-----------------------------------------------------------------------
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, 25 insertions(+), 8 deletions(-)
create 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