From: Josh Stompro <stomproj@larl.org>
Date: Tue, 13 Jan 2015 19:36:40 +0000 (-0600)
Subject: LP#1205072 - Assorted fixes for action trigger granularity settings
X-Git-Tag: sprint4-merge-nov22~1463
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e0d9c5ccfc72ff067016e92a4d0950edd6d8e7ab;p=working%2FEvergreen.git

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@larl.org>
Signed-off-by: Remington Steed <rjs7@calvin.edu>
Signed-off-by: Dan Wells <dbw2@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 1c217bc3c2..e4e7ade5ec 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 64e61c533c..278e148ca0 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 7d125e771e..94dcf11cfb 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
 ----