[open-ils-commits] [GIT] Evergreen ILS branch master updated. b3ebb9c9264c595e70cfb7daa74917b14de06d60
Evergreen Git
git at git.evergreen-ils.org
Wed Mar 2 20:29:33 EST 2016
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 b3ebb9c9264c595e70cfb7daa74917b14de06d60 (commit)
via 04f5e29734159371fd2d13d3941749cb5cb4e5cb (commit)
via 187713a3712f3f0d9591f2602ed526333e5c76f2 (commit)
via d814675c67748482a309250c0ac51880b692286d (commit)
via bd88e5ff17d017442f5a3d90c3efe9e80a9d06ed (commit)
from fbe13ad227589752c74e5902e9c39ab97e029a3d (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 b3ebb9c9264c595e70cfb7daa74917b14de06d60
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Mar 2 20:28:33 2016 -0500
LP#1392396: stamp DB update
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 71ff514..1ec157b 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0967', :eg_version); -- jboyer/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0968', :eg_version); -- jstompro/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql b/Open-ILS/src/sql/Pg/upgrade/0968.data.new_user_created_notice.sql
similarity index 95%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
rename to Open-ILS/src/sql/Pg/upgrade/0968.data.new_user_created_notice.sql
index 3b5f13c..6bff006 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0968.data.new_user_created_notice.sql
@@ -1,5 +1,7 @@
BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0968', :eg_version); -- jstompro/gmcharlt
+
--create hook for actor.usr.create_date
INSERT INTO action_trigger.hook (key, core_type, description, passive)
VALUES ('au.created', 'au', 'A user was created', 't');
commit 04f5e29734159371fd2d13d3941749cb5cb4e5cb
Author: Josh Stompro <stomproj at larl.org>
Date: Mon Aug 17 08:06:30 2015 -0500
LP#1392396 - Release notes for New Patron Notice A/T.
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/docs/RELEASE_NOTES_NEXT/Administration/NewPatronNotice.txt b/docs/RELEASE_NOTES_NEXT/Administration/NewPatronNotice.txt
new file mode 100644
index 0000000..4606e99
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Administration/NewPatronNotice.txt
@@ -0,0 +1,15 @@
+New Patron Action Trigger Notice
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A new Action Trigger event definition ("New User Created Welcome Notice")
+has been added that will allow you to send a notice after a new patron has
+been created, based on the actor.usr create-date field.
+
+This notice can be used for various tasks.
+
+ * Sending a welcome email to new patrons to market Library services.
+ * Confirm that a new patron email address is correct.
+ * Generate postal notices to send a welcome packet to new patrons.
+
+Enable this event in the staff client at *Admin* -> *Local Administration*
+-> *Notifications / Action Triggers*.
commit 187713a3712f3f0d9591f2602ed526333e5c76f2
Author: Josh Stompro <stomproj at larl.org>
Date: Mon Aug 17 13:29:44 2015 -0500
LP#1392396 - Changed the hook description to match the other
au hook entries.
Signed-off-by: Josh Stompro <stomproj at larl.org>
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 1e214d8..426e235 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -15817,7 +15817,7 @@ INSERT INTO action_trigger.environment (event_def, path) VALUES
--Start new patron welcome email notice/action -----------
--create hook for actor.usr.create_date
INSERT INTO action_trigger.hook (key, core_type, description, passive)
- VALUES ('au.created', 'au', 'Account is created', 't');
+ VALUES ('au.created', 'au', 'A user was created', 't');
--SQL to create event definition for new account creation notice
--Inactive, owned by top of org tree by default. Modify to suit needs.
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
index e241884..3b5f13c 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
@@ -2,7 +2,7 @@ BEGIN;
--create hook for actor.usr.create_date
INSERT INTO action_trigger.hook (key, core_type, description, passive)
- VALUES ('au.created', 'au', 'Account is created', 't');
+ VALUES ('au.created', 'au', 'A user was created', 't');
--SQL to create event definition for new account creation notice
--Inactive, owned by top of org tree by default. Modify to suit needs.
commit d814675c67748482a309250c0ac51880b692286d
Author: Josh Stompro <stomproj at larl.org>
Date: Mon Aug 17 13:15:32 2015 -0500
LP#1392396 - Renamed hook from "create" to "au.created" to make it
easier to tell that we are talking about "actor.user created date"
Signed-off-by: Josh Stompro <stomproj at larl.org>
Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/examples/action_trigger_filters.json.example b/Open-ILS/examples/action_trigger_filters.json.example
index 380df1b..01f913d 100644
--- a/Open-ILS/examples/action_trigger_filters.json.example
+++ b/Open-ILS/examples/action_trigger_filters.json.example
@@ -34,7 +34,7 @@
"capture_time": null
}
},
- "create" : {
+ "au.created" : {
"context_org":"home_ou",
"filter": {
"active":"t",
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index f72c080..1e214d8 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -15817,8 +15817,8 @@ INSERT INTO action_trigger.environment (event_def, path) VALUES
--Start new patron welcome email notice/action -----------
--create hook for actor.usr.create_date
INSERT INTO action_trigger.hook (key, core_type, description, passive)
- VALUES ('create', 'au', 'Account is created', 't');
-
+ VALUES ('au.created', 'au', 'Account is created', 't');
+
--SQL to create event definition for new account creation notice
--Inactive, owned by top of org tree by default. Modify to suit needs.
@@ -15827,7 +15827,7 @@ INSERT INTO action_trigger.event_definition (
validator, reactor, delay, delay_field,
max_delay, template
) VALUES (
- 'f', '1', 'New User Created Welcome Notice', 'create',
+ 'f', '1', 'New User Created Welcome Notice', 'au.created',
'NOOP_True', 'SendEmail', '10 seconds', 'create_date',
'1 day',
$$
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
index 373aa5c..e241884 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
@@ -2,7 +2,7 @@ BEGIN;
--create hook for actor.usr.create_date
INSERT INTO action_trigger.hook (key, core_type, description, passive)
- VALUES ('create', 'au', 'Account is created', 't');
+ VALUES ('au.created', 'au', 'Account is created', 't');
--SQL to create event definition for new account creation notice
--Inactive, owned by top of org tree by default. Modify to suit needs.
@@ -12,7 +12,7 @@ INSERT INTO action_trigger.event_definition (
validator, reactor, delay, delay_field,
max_delay, template
) VALUES (
- 'f', '1', 'New User Created Welcome Notice', 'create',
+ 'f', '1', 'New User Created Welcome Notice', 'au.created',
'NOOP_True', 'SendEmail', '10 seconds', 'create_date',
'1 day',
$$
commit bd88e5ff17d017442f5a3d90c3efe9e80a9d06ed
Author: Josh Stompro <stomproj at larl.org>
Date: Wed Apr 29 14:22:03 2015 -0500
LP#1392396 - New patron welcome email action/trigger event def
This adds a new event definition to new installs for sending an email
to new users soon after their accounts are created.
An update script is also included to add this event to existing installs.
Signed-off-by: Josh Stompro <stomproj at larl.org>
Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/examples/action_trigger_filters.json.example b/Open-ILS/examples/action_trigger_filters.json.example
index a721cb1..380df1b 100644
--- a/Open-ILS/examples/action_trigger_filters.json.example
+++ b/Open-ILS/examples/action_trigger_filters.json.example
@@ -33,5 +33,12 @@
"cancel_time": null,
"capture_time": null
}
+ },
+ "create" : {
+ "context_org":"home_ou",
+ "filter": {
+ "active":"t",
+ "deleted":"f"
+ }
}
}
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 1f515c3..f72c080 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -15814,7 +15814,64 @@ INSERT INTO action_trigger.environment (event_def, path) VALUES
(currval('action_trigger.event_definition_id_seq'), 'home_ou.mailing_address'),
(currval('action_trigger.event_definition_id_seq'), 'home_ou.billing_address');
-
+--Start new patron welcome email notice/action -----------
+--create hook for actor.usr.create_date
+INSERT INTO action_trigger.hook (key, core_type, description, passive)
+ VALUES ('create', 'au', 'Account is created', 't');
+
+--SQL to create event definition for new account creation notice
+--Inactive, owned by top of org tree by default. Modify to suit needs.
+
+INSERT INTO action_trigger.event_definition (
+ active, owner, name, hook,
+ validator, reactor, delay, delay_field,
+ max_delay, template
+) VALUES (
+ 'f', '1', 'New User Created Welcome Notice', 'create',
+ 'NOOP_True', 'SendEmail', '10 seconds', 'create_date',
+ '1 day',
+$$
+[%- USE date -%]
+[%- user = target -%]
+[%- lib = target.home_ou -%]
+To: [%- params.recipient_email || user.email %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
+Reply-To: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
+Subject: New Library Account Sign-up - Welcome!
+Auto-Submitted: auto-generated
+
+Dear [% user.first_given_name %] [% user.family_name %],
+
+Thank you for signing up for an account with the [% lib.name %] on [% user.create_date.substr(0, 10) %].
+
+This email is your confirmation that your account is set up and ready as well as testing to see that we have your correct email address.
+
+If you did not sign up for an account at the library and have received this email in error, please reply and let us know.
+
+You can access your account online at http://catalog/eg/opac/login. From that site you can search the catalog, request materials, renew materials, leave comments, leave suggestions for titles you would like the library to purchase and update your account information.
+
+Sincerely,
+[% lib.name %]
+
+Contact your library for more information:
+
+[% lib.name %]
+[%- SET addr = lib.mailing_address -%]
+[%- IF !addr -%] [%- SET addr = lib.billing_address -%] [%- END %]
+[% addr.street1 %] [% addr.street2 %]
+[% addr.city %], [% addr.state %]
+[% addr.post_code %]
+[% lib.phone %]
+[% lib.email %]
+
+$$);
+
+--insert environment values
+INSERT INTO action_trigger.environment (event_def, path) VALUES
+ (CURRVAL('action_trigger.event_definition_id_seq'), 'home_ou.mailing_address'),
+ (CURRVAL('action_trigger.event_definition_id_seq'), 'home_ou.billing_address');
+-- End new patron welcome message notice -----------
+
-- OUS's for patron self-reg
INSERT INTO config.org_unit_setting_type
(name, grp, datatype, label, description)
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
new file mode 100644
index 0000000..373aa5c
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.new_user_created_notice.sql
@@ -0,0 +1,59 @@
+BEGIN;
+
+--create hook for actor.usr.create_date
+INSERT INTO action_trigger.hook (key, core_type, description, passive)
+ VALUES ('create', 'au', 'Account is created', 't');
+
+--SQL to create event definition for new account creation notice
+--Inactive, owned by top of org tree by default. Modify to suit needs.
+
+INSERT INTO action_trigger.event_definition (
+ active, owner, name, hook,
+ validator, reactor, delay, delay_field,
+ max_delay, template
+) VALUES (
+ 'f', '1', 'New User Created Welcome Notice', 'create',
+ 'NOOP_True', 'SendEmail', '10 seconds', 'create_date',
+ '1 day',
+$$
+[%- USE date -%]
+[%- user = target -%]
+[%- lib = target.home_ou -%]
+To: [%- params.recipient_email || user.email %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
+Reply-To: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
+Subject: New Library Account Sign-up - Welcome!
+Auto-Submitted: auto-generated
+
+Dear [% user.first_given_name %] [% user.family_name %],
+
+Thank you for signing up for an account with the [% lib.name %] on [% user.create_date.substr(0, 10) %].
+
+This email is your confirmation that your account is set up and ready as well as testing to see that we have your correct email address.
+
+If you did not sign up for an account at the library and have received this email in error, please reply and let us know.
+
+You can access your account online at http://catalog/eg/opac/login. From that site you can search the catalog, request materials, renew materials, leave comments, leave suggestions for titles you would like the library to purchase and update your account information.
+
+Sincerely,
+[% lib.name %]
+
+Contact your library for more information:
+
+[% lib.name %]
+[%- SET addr = lib.mailing_address -%]
+[%- IF !addr -%] [%- SET addr = lib.billing_address -%] [%- END %]
+[% addr.street1 %] [% addr.street2 %]
+[% addr.city %], [% addr.state %]
+[% addr.post_code %]
+[% lib.phone %]
+[% lib.email %]
+
+$$);
+
+--insert environment values
+INSERT INTO action_trigger.environment (event_def, path) VALUES
+ (CURRVAL('action_trigger.event_definition_id_seq'), 'home_ou.mailing_address'),
+ (CURRVAL('action_trigger.event_definition_id_seq'), 'home_ou.billing_address');
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
.../examples/action_trigger_filters.json.example | 7 ++
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 59 +++++++++++++++++++-
...e.sql => 0968.data.new_user_created_notice.sql} | 28 ++++++----
.../Administration/NewPatronNotice.txt | 15 +++++
5 files changed, 98 insertions(+), 13 deletions(-)
copy Open-ILS/src/sql/Pg/upgrade/{0939.30day.expiration.prenotice.sql => 0968.data.new_user_created_notice.sql} (54%)
create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/NewPatronNotice.txt
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list