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, main has been updated via 34ea53321cbcc50dff3cdce0c0767a6f923d667b (commit) via dd4ea72e78747fd8c231aa5eca71212114a66fe5 (commit) from a59c0fab59e06355a4f0f937588b0b928c17d5ba (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 34ea53321cbcc50dff3cdce0c0767a6f923d667b Author: blake <blake@mobiusconsortium.org> Date: Mon Mar 10 16:18:10 2025 -0500 Stamping upgrade 1459 Signed-off-by: blake <blake@mobiusconsortium.org> diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 3c5363363d..121d2e257b 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 ('1458', :eg_version); -- terranm/blake +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1459', :eg_version); -- terranm/blake CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql b/Open-ILS/src/sql/Pg/upgrade/1459.schema.opac_google_analytics.sql similarity index 93% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql rename to Open-ILS/src/sql/Pg/upgrade/1459.schema.opac_google_analytics.sql index 77c23c1b81..6d0bff0cdb 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1459.schema.opac_google_analytics.sql @@ -2,7 +2,7 @@ BEGIN; -- Move Google Analytics settings from config.tt2 to library settings --- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1459', :eg_version); INSERT into config.org_unit_setting_type (name, grp, label, description, datatype) commit dd4ea72e78747fd8c231aa5eca71212114a66fe5 Author: Terran McCanna <tmccanna@georgialibraries.org> Date: Thu Jan 16 12:23:09 2025 -0500 LP1906699 Move Google Analytics Config to Library Settings Moves the Google Analytics configuration from the config.tt2 file in the Bootstrap OPAC to two new library settings. . Google Analytics: Enable (true/false) . Google Analytics: Code (Analytics account code) Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> Signed-off-by: Shula Link <devonkonti@gmail.com> Signed-off-by: blake <blake@mobiusconsortium.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 f9fa215fa7..52ed1f9a44 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -24940,3 +24940,28 @@ VALUES ( 'coust', 'description'), 'string' ); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.google_analytics_enable', + 'opac', + oils_i18n_gettext('opac.google_analytics_enable', + 'Google Analytics: Enable', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_show', + 'Enable Google Analytics in the OPAC. Default is false.', + 'coust', 'description'), + 'bool' +), ( + 'opac.google_analytics_code', + 'opac', + oils_i18n_gettext('opac.google_analytics_code', + 'Google Analytics: Code', + 'coust', 'label'), + oils_i18n_gettext('opac.google_analytics_code', + 'Account code provided by Google. (Example: G-GVGQ11X12)', + 'coust', 'description'), + 'string' +); + diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql new file mode 100644 index 0000000000..77c23c1b81 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql @@ -0,0 +1,35 @@ +BEGIN; + +-- Move Google Analytics settings from config.tt2 to library settings + +-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.google_analytics_enable', + 'opac', + oils_i18n_gettext('opac.google_analytics_enable', + 'Google Analytics: Enable', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_show', + 'Enable Google Analytics in the OPAC. Default is false.', + 'coust', 'description'), + 'bool' +); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.google_analytics_code', + 'opac', + oils_i18n_gettext('opac.google_analytics_code', + 'Google Analytics: Code', + 'coust', 'label'), + oils_i18n_gettext('opac.google_analytics_code', + 'Account code provided by Google. (Example: G-GVGQ11X12)', + 'coust', 'description'), + 'string' +); + +COMMIT; \ No newline at end of file diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 index 29370bca34..ab3278a7d9 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 @@ -42,15 +42,6 @@ ctx.refworks.url = 'http://www.refworks.com'; openurl.enabled = 'false'; openurl.baseurl = 'http://sfx.example.com/instance'; -############################################################################## -# Google Analytics support -############################################################################## -# You can enable Google Analytics support in Evergreen by entering a -# valid Google Analytics code and changing 'false' to 'true' -############################################################################## -google_analytics.enabled = 'false'; -google_analytics.code = 'UA-9999999-99'; - ############################################################################## # Ebook API integration ############################################################################## diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/goog_analytics.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/goog_analytics.tt2 index c62df73e38..d24c0212e7 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/goog_analytics.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/goog_analytics.tt2 @@ -1,10 +1,11 @@ [%- PROCESS "opac/parts/header.tt2"; - IF google_analytics.enabled == 'true' %] - <script async src="https://www.googletagmanager.com/gtag/js?id=[% google_analytics.code %]"></script> + IF ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.google_analytics_enable'); + mygooglecode = ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.google_analytics_code'); %] + <script async src="https://www.googletagmanager.com/gtag/js?id=[% mygooglecode %]"></script> <script> window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); - gtag('config', '[% google_analytics.code %]'); + gtag('config', '[% mygooglecode %]'); </script> [%- END %] diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/opac_google_analytics.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/opac_google_analytics.adoc new file mode 100644 index 0000000000..622c264c46 --- /dev/null +++ b/docs/RELEASE_NOTES_NEXT/OPAC/opac_google_analytics.adoc @@ -0,0 +1,8 @@ +== Move Google Analytics configuration to library settings == + +Moves the Google Analytics configuration from the config.tt2 file +in the Bootstrap OPAC to two new library settings. + +. Google Analytics: Enable (true/false) +. Google Analytics: Code (Analytics account code) + ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 25 ++++++++++++++++ .../upgrade/1459.schema.opac_google_analytics.sql | 35 ++++++++++++++++++++++ .../src/templates-bootstrap/opac/parts/config.tt2 | 9 ------ .../opac/parts/goog_analytics.tt2 | 7 +++-- .../OPAC/opac_google_analytics.adoc | 8 +++++ 6 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1459.schema.opac_google_analytics.sql create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/opac_google_analytics.adoc hooks/post-receive -- Evergreen ILS