[open-ils-commits] [GIT] Evergreen ILS branch rel_3_2 updated. 7ef2eca06b09e1f1324b5ac33cbf2fbc2e6e2163
Evergreen Git
git at git.evergreen-ils.org
Fri May 24 14:57:56 EDT 2019
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, rel_3_2 has been updated
via 7ef2eca06b09e1f1324b5ac33cbf2fbc2e6e2163 (commit)
via d9ba1e90496f9bccdd859535cede9d089815c40a (commit)
from b8db28bf2e321f826b32f9b574bde9c269bce6a0 (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 7ef2eca06b09e1f1324b5ac33cbf2fbc2e6e2163
Author: Bill Erickson <berickxx at gmail.com>
Date: Fri May 24 14:52:58 2019 -0400
LP1819181 Stamping upgrade: DoB example setting
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 14f4852c3a..3b96c9f136 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,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 ('1164', :eg_version); -- mmorgan/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1165', :eg_version); -- jboyer/berick
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1165.data.lp1819181-example-dob.sql b/Open-ILS/src/sql/Pg/upgrade/1165.data.lp1819181-example-dob.sql
new file mode 100644
index 0000000000..9502134923
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1165.data.lp1819181-example-dob.sql
@@ -0,0 +1,12 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1165', :eg_version);
+
+INSERT INTO config.org_unit_setting_type (name,label,grp,description,datatype)
+VALUES ('ui.patron.edit.au.dob.example',oils_i18n_gettext('ui.patron.edit.au.dob.example',
+ 'Example dob field on patron registration', 'coust', 'label'),'gui',
+ oils_i18n_gettext('ui.patron.edit.au.dob.example',
+ 'The Example for validation on the dob field in patron registration.', 'coust', 'description'),
+ 'string');
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1819181-example-dob.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1819181-example-dob.sql
deleted file mode 100644
index b35f9c7a2d..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1819181-example-dob.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO config.org_unit_setting_type (name,label,grp,description,datatype)
-VALUES ('ui.patron.edit.au.dob.example',oils_i18n_gettext('ui.patron.edit.au.dob.example',
- 'Example dob field on patron registration', 'coust', 'label'),'gui',
- oils_i18n_gettext('ui.patron.edit.au.dob.example',
- 'The Example for validation on the dob field in patron registration.', 'coust', 'description'),
- 'string');
-
-COMMIT;
commit d9ba1e90496f9bccdd859535cede9d089815c40a
Author: Jason Boyer <jboyer at library.in.gov>
Date: Fri Mar 8 11:03:38 2019 -0500
LP1819181: Example DOB for Patron Reg/Edit
Add the necessary coust entry for a patron dob example
and teach the registration controller to use it.
Signed-off-by: Jason Boyer <jboyer at library.in.gov>
Signed-off-by: Bill Erickson <berickxx at gmail.com>
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 b30ebb6092..d6d064ffeb 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -4752,6 +4752,15 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'bool', null)
+,( 'ui.patron.edit.au.dob.example', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.dob.example',
+ 'Example dob field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.dob.example',
+ 'The Example for validation on the dob field in patron registration.',
+ 'coust', 'description'),
+ 'string', null)
+
,( 'ui.patron.edit.au.dob.calendar', 'gui',
oils_i18n_gettext('ui.patron.edit.au.dob.calendar',
'Show calendar widget for dob field on patron registration',
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1819181-example-dob.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1819181-example-dob.sql
new file mode 100644
index 0000000000..b35f9c7a2d
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1819181-example-dob.sql
@@ -0,0 +1,12 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.org_unit_setting_type (name,label,grp,description,datatype)
+VALUES ('ui.patron.edit.au.dob.example',oils_i18n_gettext('ui.patron.edit.au.dob.example',
+ 'Example dob field on patron registration', 'coust', 'label'),'gui',
+ oils_i18n_gettext('ui.patron.edit.au.dob.example',
+ 'The Example for validation on the dob field in patron registration.', 'coust', 'description'),
+ 'string');
+
+COMMIT;
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index 35fbfde460..cd0e48ebc4 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -348,6 +348,7 @@ angular.module('egCoreMod')
'ui.patron.edit.au.dob.show',
'ui.patron.edit.au.dob.suggest',
'ui.patron.edit.au.dob.calendar',
+ 'ui.patron.edit.au.dob.example',
'ui.patron.edit.au.juvenile.show',
'ui.patron.edit.au.juvenile.suggest',
'ui.patron.edit.au.ident_value.show',
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 9 +++++++++
.../src/sql/Pg/upgrade/1165.data.lp1819181-example-dob.sql | 12 ++++++++++++
Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js | 1 +
4 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1165.data.lp1819181-example-dob.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list