[open-ils-commits] [GIT] Evergreen ILS branch master updated. 6d890f591bd94668677eb40bcac8d5a62dfb53d9
Evergreen Git
git at git.evergreen-ils.org
Fri May 24 15:08:23 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, master has been updated
via 6d890f591bd94668677eb40bcac8d5a62dfb53d9 (commit)
via 9c224c1420ab21f8587175da36820a9f68af51f2 (commit)
via 68b4a665b2e554c80410cac1949ba48e0bc821c9 (commit)
from 6e13cf72fae54271601259ea6cccfd41c64297d3 (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 6d890f591bd94668677eb40bcac8d5a62dfb53d9
Author: Bill Erickson <berickxx at gmail.com>
Date: Fri May 24 15:06:24 2019 -0400
LP1817332 Stamping ugprade: timezone examples
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 3b96c9f136..f50ff9c3ca 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 ('1165', :eg_version); -- jboyer/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1166', :eg_version); -- remingtron/gmcharlt/berick
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql b/Open-ILS/src/sql/Pg/upgrade/1166.data.update_timezone_OUS_description.sql
similarity index 88%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
rename to Open-ILS/src/sql/Pg/upgrade/1166.data.update_timezone_OUS_description.sql
index 60f7931a88..5f79d9aefd 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1166.data.update_timezone_OUS_description.sql
@@ -1,6 +1,6 @@
BEGIN;
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1166', :eg_version);
UPDATE config.org_unit_setting_type
SET description =
commit 9c224c1420ab21f8587175da36820a9f68af51f2
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Thu May 23 11:17:44 2019 -0400
LP#1817332: (follow-up) tweak description
Per a suggestion from Jane Sandberg, the description now includes
an example of a time zone name with an underscore. Also, the database
update will no longer overwrite any custom description that the
Evergreen admin may have put in.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
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 ea97a5b54e..c887e9a5bd 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -17495,7 +17495,7 @@ INSERT into config.org_unit_setting_type
'coust', 'label'),
oils_i18n_gettext('lib.timezone',
'Define the time zone in which a library physically resides. Examples: America/Toronto, ' ||
- 'America/Chicago, America/Denver, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
+ 'America/Chicago, America/Los_Angeles, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
'<a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" target="_blank">complete list</a> ' ||
'(Note: Only use "canonical" timezones).',
'coust', 'description'),
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
index a5e46a3efb..60f7931a88 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
@@ -5,10 +5,11 @@ BEGIN;
UPDATE config.org_unit_setting_type
SET description =
'Define the time zone in which a library physically resides. Examples: America/Toronto, ' ||
-'America/Chicago, America/Denver, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
+'America/Chicago, America/Los_Angeles, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
'<a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" target="_blank">complete list</a> ' ||
'(Note: Only use "canonical" timezones).'
- WHERE name = 'lib.timezone';
+WHERE name = 'lib.timezone'
+AND description = 'Define the time zone in which a library physically resides';
COMMIT;
commit 68b4a665b2e554c80410cac1949ba48e0bc821c9
Author: Remington Steed <rjs7 at calvin.edu>
Date: Thu Feb 21 14:54:19 2019 -0500
LP#1817332 Add example to lib.timezone setting description
This commit adds a few examples of acceptable lib.timezone values to the
setting description, with the goal of using examples of existing
Evergreen installations. It also includes a clickable link to the
extensive list on Wikipedia. Since the settings editor is displayed
within an iframe, the link needs a "target" to successfully trigger.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
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 7e76891eff..ea97a5b54e 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -17494,7 +17494,10 @@ INSERT into config.org_unit_setting_type
'Library time zone',
'coust', 'label'),
oils_i18n_gettext('lib.timezone',
- 'Define the time zone in which a library physically resides',
+ 'Define the time zone in which a library physically resides. Examples: America/Toronto, ' ||
+ 'America/Chicago, America/Denver, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
+ '<a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" target="_blank">complete list</a> ' ||
+ '(Note: Only use "canonical" timezones).',
'coust', 'description'),
'string');
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
new file mode 100644
index 0000000000..a5e46a3efb
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
@@ -0,0 +1,15 @@
+BEGIN;
+
+--SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+UPDATE config.org_unit_setting_type
+ SET description =
+'Define the time zone in which a library physically resides. Examples: America/Toronto, ' ||
+'America/Chicago, America/Denver, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
+'<a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" target="_blank">complete list</a> ' ||
+'(Note: Only use "canonical" timezones).'
+ WHERE name = 'lib.timezone';
+
+COMMIT;
+
+
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 5 ++++-
.../1166.data.update_timezone_OUS_description.sql | 16 ++++++++++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1166.data.update_timezone_OUS_description.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list