[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. cc38fdc351e545f29ef783a3a194d5f000826485
Evergreen Git
git at git.evergreen-ils.org
Thu Aug 16 15:21:09 EDT 2012
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_2_2 has been updated
via cc38fdc351e545f29ef783a3a194d5f000826485 (commit)
via 1b6f161984ed82d0a14cc74d303806975099b3b8 (commit)
via 89f3acd5984b0391fc7e30b9d602ea63b0c654a6 (commit)
from 7e325cde9138b6cac08ee11eaa80ccf70a9c14ed (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 cc38fdc351e545f29ef783a3a194d5f000826485
Author: Mike Rylander <mrylander at gmail.com>
Date: Thu Aug 16 15:11:29 2012 -0400
Stamping upgrade script for copy editor field hiding permission
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Conflicts:
Open-ILS/src/sql/Pg/002.schema.config.sql
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index b7b0905..fea872b 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -87,7 +87,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 ('0726', :eg_version); -- denials
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0736', :eg_version); -- miker/tsbere
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql b/Open-ILS/src/sql/Pg/upgrade/0736.data.copy_editor_perms.sql
similarity index 77%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
rename to Open-ILS/src/sql/Pg/upgrade/0736.data.copy_editor_perms.sql
index b9137b8..546a161 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0736.data.copy_editor_perms.sql
@@ -1,6 +1,11 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0736', :eg_version);
INSERT INTO permission.perm_list (id, code, description)
VALUES (539, 'UPDATE_ORG_UNIT_SETTING.ui.hide_copy_editor_fields', 'Allows staff to edit displayed copy editor fields');
UPDATE config.org_unit_setting_type SET update_perm = 539 WHERE name = 'ui.hide_copy_editor_fields';
+COMMIT;
+
commit 1b6f161984ed82d0a14cc74d303806975099b3b8
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Thu Aug 16 14:58:01 2012 -0400
Update permission name to match existing ones
To be consistent with our previous naming scheme for these.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
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 d740ec6..b7689d4 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1558,7 +1558,7 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
'Allows a user to create/retrieve/update/delete copy location groups', 'ppl', 'description' )),
( 534, 'ADMIN_USER_ACTIVITY_TYPE', oils_i18n_gettext( 534,
'Allows a user to create/retrieve/update/delete user activity types', 'ppl', 'description' )),
- ( 539, 'UPDATE_ui.hide_copy_editor_fields', oils_i18n_gettext( 539,
+ ( 539, 'UPDATE_ORG_UNIT_SETTING.ui.hide_copy_editor_fields', oils_i18n_gettext( 539,
'Allows staff to edit displayed copy editor fields', 'ppl', 'description' ))
;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
index 3bbc2bc..b9137b8 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
@@ -1,6 +1,6 @@
INSERT INTO permission.perm_list (id, code, description)
- VALUES (539, 'UPDATE_ui.hide_copy_editor_fields', 'Allows staff to edit displayed copy editor fields');
+ VALUES (539, 'UPDATE_ORG_UNIT_SETTING.ui.hide_copy_editor_fields', 'Allows staff to edit displayed copy editor fields');
UPDATE config.org_unit_setting_type SET update_perm = 539 WHERE name = 'ui.hide_copy_editor_fields';
commit 89f3acd5984b0391fc7e30b9d602ea63b0c654a6
Author: Mike Rylander <mrylander at gmail.com>
Date: Thu Aug 16 13:45:23 2012 -0400
Provide permission for copy editor field hiding
We can adjust what fields are available in the copy editor in 2.2+, but that
requires the general UPDATE_ORG_SETTING permission. The YAOUS-specific
permission here allows more granular control, so that staff can be given the
ability to adjust only that one OU setting.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
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 db370c4..d740ec6 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1557,7 +1557,10 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
( 533, 'ADMIN_COPY_LOCATION_GROUP', oils_i18n_gettext( 533,
'Allows a user to create/retrieve/update/delete copy location groups', 'ppl', 'description' )),
( 534, 'ADMIN_USER_ACTIVITY_TYPE', oils_i18n_gettext( 534,
- 'Allows a user to create/retrieve/update/delete user activity types', 'ppl', 'description' ));
+ 'Allows a user to create/retrieve/update/delete user activity types', 'ppl', 'description' )),
+ ( 539, 'UPDATE_ui.hide_copy_editor_fields', oils_i18n_gettext( 539,
+ 'Allows staff to edit displayed copy editor fields', 'ppl', 'description' ))
+;
SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);
@@ -11571,7 +11574,7 @@ INSERT INTO config.global_flag (name, enabled, label)
)
);
-INSERT INTO config.org_unit_setting_type ( name, label, description, datatype, grp )
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype, grp, update_perm )
VALUES (
'ui.hide_copy_editor_fields',
oils_i18n_gettext(
@@ -11589,7 +11592,8 @@ INSERT INTO config.org_unit_setting_type ( name, label, description, datatype, g
'description'
),
'array',
- 'gui'
+ 'gui',
+ 539
);
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
new file mode 100644
index 0000000..3bbc2bc
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy_editor_perms.sql
@@ -0,0 +1,6 @@
+
+INSERT INTO permission.perm_list (id, code, description)
+ VALUES (539, 'UPDATE_ui.hide_copy_editor_fields', 'Allows staff to edit displayed copy editor fields');
+
+UPDATE config.org_unit_setting_type SET update_perm = 539 WHERE name = 'ui.hide_copy_editor_fields';
+
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 10 +++++++---
.../sql/Pg/upgrade/0736.data.copy_editor_perms.sql | 11 +++++++++++
3 files changed, 19 insertions(+), 4 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0736.data.copy_editor_perms.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list