[open-ils-commits] [GIT] Evergreen ILS branch master updated. da42d5649ea4bc12a2d2ab28d4bddca15ad0278d
Evergreen Git
git at git.evergreen-ils.org
Tue Mar 31 08:13:02 EDT 2020
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 da42d5649ea4bc12a2d2ab28d4bddca15ad0278d (commit)
via f11b2356b39e5e7a1a3b728c072cd531dc93125d (commit)
via 3b9b5e7b22d2b39f11dc518d1023abac9d067901 (commit)
from 4ea65d1838e6937f13087477effbfb61a8734ccf (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 da42d5649ea4bc12a2d2ab28d4bddca15ad0278d
Author: Jason Boyer <JBoyer at eoli.info>
Date: Tue Mar 31 08:07:45 2020 -0400
LP1849683: Stamp upgrade script
Signed-off-by: Jason Boyer <JBoyer at eoli.info>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index f3e6244165..9f9bcbb20e 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 ('1200', :eg_version); -- jeffdavis/csharp
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1201', :eg_version); -- rhamby/jboyer
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.opac_custom_css_permission.sql b/Open-ILS/src/sql/Pg/upgrade/1201.data.opac_custom_css_permission.sql
similarity index 80%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.opac_custom_css_permission.sql
rename to Open-ILS/src/sql/Pg/upgrade/1201.data.opac_custom_css_permission.sql
index e7923affe1..981faeea26 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.opac_custom_css_permission.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1201.data.opac_custom_css_permission.sql
@@ -1,6 +1,6 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1201', :eg_version); -- rhamby/jboyer
INSERT INTO permission.perm_list ( id, code, description ) VALUES
( 620, 'UPDATE_ORG_UNIT_SETTING.opac.patron.custom_css', oils_i18n_gettext(620,
commit f11b2356b39e5e7a1a3b728c072cd531dc93125d
Author: Jason Boyer <JBoyer at eoli.info>
Date: Thu Mar 5 10:44:07 2020 -0500
LP1849683: i18n and space supplement
Minor changes to realign inserts and permission assignment
with those surrounding, and remove a bit of EOL whitespace
in the release note.
Signed-off-by: Jason Boyer <JBoyer at eoli.info>
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 12cbafdfbd..0b30009bee 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -4410,6 +4410,15 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'integer', null)
+,( 'opac.patron.custom_css', 'opac',
+ oils_i18n_gettext('opac.patron.custom_css',
+ 'Custom CSS for the OPAC',
+ 'coust', 'label'),
+ oils_i18n_gettext('opac.patron.custom_css',
+ 'Custom CSS for the OPAC',
+ 'coust', 'description'),
+ 'string', NULL)
+
,( 'opac.payment_history_age_limit', 'opac',
oils_i18n_gettext('opac.payment_history_age_limit',
'Payment History Age Limit',
@@ -5548,9 +5557,6 @@ INSERT into config.org_unit_setting_type
'bool', null)
;
-INSERT INTO config.org_unit_setting_type ( name, label, grp, description, datatype, update_perm )
-VALUES ('opac.update.css','Setting CSS in the OPAC','opac','Setting CSS in the OPAC','string',620);
-
UPDATE config.org_unit_setting_type
SET view_perm = (SELECT id FROM permission.perm_list
WHERE code = 'VIEW_CREDIT_CARD_PROCESSING' LIMIT 1)
@@ -5561,6 +5567,11 @@ UPDATE config.org_unit_setting_type
WHERE code = 'ADMIN_CREDIT_CARD_PROCESSING' LIMIT 1)
WHERE name LIKE 'credit.processor%' AND update_perm IS NULL;
+UPDATE config.org_unit_setting_type
+ SET update_perm = (SELECT id FROM permission.perm_list
+ WHERE code = 'UPDATE_ORG_UNIT_SETTING.opac.patron.custom_css' LIMIT 1)
+ WHERE name = 'opac.patron.custom_css' AND update_perm IS NULL;
+
-- *** Has to go below coust definition to satisfy referential integrity ***
-- In booking, elbow room defines:
-- a) how far in the future you must make a reservation on a given item if
diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc
index 30309565ae..9ad01f3924 100644
--- a/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc
@@ -1,3 +1,6 @@
-Custom CSS in OPAC
+Custom CSS in OPAC
^^^^^^^^^^^^^^^^^^
-There is now a library setting called opac.patron.custom_css. This can be populated with CSS that will load in the OPAC after the stylesheets and allow for custom CSS without editing server side templates. The permission UPDATE_ORG_UNIT_SETTING.opac.patron.custom_css manages access to it.
+There is now a library setting called opac.patron.custom_css. This can be
+populated with CSS that will load in the OPAC after the stylesheets and
+allow for custom CSS without editing server side templates. The permission
+UPDATE_ORG_UNIT_SETTING.opac.patron.custom_css manages access to it.
commit 3b9b5e7b22d2b39f11dc518d1023abac9d067901
Author: Rogan Hamby <rogan.hamby at gmail.com>
Date: Mon Oct 28 19:30:57 2019 -0400
LP1849683: Permission for custom css setting
Add a permission to restrict who has access to
the Custom CSS for the OPAC setting.
Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
Signed-off-by: Jason Boyer <JBoyer at eoli.info>
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 e7e1a377fe..12cbafdfbd 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1933,7 +1933,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
( 618, 'CREATE_PRECAT', oils_i18n_gettext(618,
'Allows a user to create a pre-catalogued copy', 'ppl', 'description')),
( 619, 'EDIT_SELF_IN_CLIENT', oils_i18n_gettext(619,
- 'Allow a user to edit their own account in the staff client', 'ppl', 'description'))
+ 'Allow a user to edit their own account in the staff client', 'ppl', 'description')),
+ ( 620, 'UPDATE_ORG_UNIT_SETTING.opac.patron.custom_css', oils_i18n_gettext(620,
+ 'Update CSS setting for the OPAC', 'ppl', 'description'))
;
@@ -4408,15 +4410,6 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'integer', null)
-,( 'opac.patron.custom_css', 'opac',
- oils_i18n_gettext('opac.patron.custom_css',
- 'Custom CSS for the OPAC',
- 'coust', 'label'),
- oils_i18n_gettext('opac.patron.custom_css',
- 'Custom CSS for the OPAC',
- 'coust', 'description'),
- 'string', NULL)
-
,( 'opac.payment_history_age_limit', 'opac',
oils_i18n_gettext('opac.payment_history_age_limit',
'Payment History Age Limit',
@@ -5555,6 +5548,9 @@ INSERT into config.org_unit_setting_type
'bool', null)
;
+INSERT INTO config.org_unit_setting_type ( name, label, grp, description, datatype, update_perm )
+VALUES ('opac.update.css','Setting CSS in the OPAC','opac','Setting CSS in the OPAC','string',620);
+
UPDATE config.org_unit_setting_type
SET view_perm = (SELECT id FROM permission.perm_list
WHERE code = 'VIEW_CREDIT_CARD_PROCESSING' LIMIT 1)
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.opac_custom_css_permission.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.opac_custom_css_permission.sql
new file mode 100644
index 0000000000..e7923affe1
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.opac_custom_css_permission.sql
@@ -0,0 +1,12 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO permission.perm_list ( id, code, description ) VALUES
+( 620, 'UPDATE_ORG_UNIT_SETTING.opac.patron.custom_css', oils_i18n_gettext(620,
+ 'Update CSS setting for the OPAC', 'ppl', 'description'))
+;
+
+UPDATE config.org_unit_setting_type SET update_perm = 620 WHERE name = 'opac.patron.custom_css';
+
+COMMIT;
diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc
new file mode 100644
index 0000000000..30309565ae
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc
@@ -0,0 +1,3 @@
+Custom CSS in OPAC
+^^^^^^^^^^^^^^^^^^
+There is now a library setting called opac.patron.custom_css. This can be populated with CSS that will load in the OPAC after the stylesheets and allow for custom CSS without editing server side templates. The permission UPDATE_ORG_UNIT_SETTING.opac.patron.custom_css manages access to it.
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 9 ++++++++-
.../sql/Pg/upgrade/1201.data.opac_custom_css_permission.sql | 12 ++++++++++++
docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc | 6 ++++++
4 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1201.data.opac_custom_css_permission.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list