[open-ils-commits] [GIT] Evergreen ILS branch master updated. 6d94067f076785499a1ffaf60dce193aa57f0a41
Evergreen Git
git at git.evergreen-ils.org
Thu May 25 09:15:08 EDT 2017
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 6d94067f076785499a1ffaf60dce193aa57f0a41 (commit)
via 5f8238c26c7dadf848c946103f80126f3edec49e (commit)
via adda813e888222a4f4ec5575901594970df5f6c7 (commit)
from 52b09a619b1cd8475e88bab16bd1efa5917a33ea (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 6d94067f076785499a1ffaf60dce193aa57f0a41
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Thu May 25 09:24:24 2017 -0400
LP#1498155: stamp DB update
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index c8f3419..f8091f0 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -90,7 +90,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 ('1040', :eg_version); --gmcharlt/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1041', :eg_version); -- stompro/csharp/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql b/Open-ILS/src/sql/Pg/upgrade/1041.data.remove_SET_CIRC_MISSING.sql
similarity index 80%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql
rename to Open-ILS/src/sql/Pg/upgrade/1041.data.remove_SET_CIRC_MISSING.sql
index faa2a6b..8113f89 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1041.data.remove_SET_CIRC_MISSING.sql
@@ -1,5 +1,7 @@
BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1041', :eg_version); -- stompro/csharp/gmcharlt
+
--delete all instances from permission.grp_perm_map first
DELETE FROM permission.grp_perm_map where perm in
(select id from permission.perm_list where code='SET_CIRC_MISSING');
commit 5f8238c26c7dadf848c946103f80126f3edec49e
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Sat Aug 20 14:25:07 2016 -0400
LP#1498155 - Also remove user-assigned SET_CIRC_MISSING perm.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql
index a7f2911..faa2a6b 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql
@@ -4,6 +4,10 @@ BEGIN;
DELETE FROM permission.grp_perm_map where perm in
(select id from permission.perm_list where code='SET_CIRC_MISSING');
+--delete all instances from permission.usr_perm_map too
+DELETE FROM permission.usr_perm_map where perm in
+(select id from permission.perm_list where code='SET_CIRC_MISSING');
+
--delete from permission.perm_list
DELETE FROM permission.perm_list where code='SET_CIRC_MISSING';
commit adda813e888222a4f4ec5575901594970df5f6c7
Author: Josh Stompro <stomproj at larl.org>
Date: Thu Nov 12 21:53:36 2015 -0600
LP1498155 - Remove SET_CIRC_MISSING permission.
SET_CIRC_MISSING isn't used anywhere, remove it to avoid
confusing it with MARK_ITEM_MISSING permission.
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.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 a657039..e3c34b4 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -573,8 +573,6 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
'Allow a user to record payments in the Billing Interface', 'ppl', 'description' )),
( 34, 'SET_CIRC_LOST', oils_i18n_gettext( 34,
'Allow a user to mark an item as ''lost''', 'ppl', 'description' )),
- ( 35, 'SET_CIRC_MISSING', oils_i18n_gettext( 35,
- 'Allow a user to mark an item as ''missing''', 'ppl', 'description' )),
( 36, 'SET_CIRC_CLAIMS_RETURNED', oils_i18n_gettext( 36,
'Allow a user to mark an item as ''claims returned''', 'ppl', 'description' )),
( 37, 'CREATE_TRANSACTION', oils_i18n_gettext( 37,
@@ -2096,7 +2094,6 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
'SET_CIRC_CLAIMS_RETURNED',
'SET_CIRC_CLAIMS_RETURNED.override',
'SET_CIRC_LOST',
- 'SET_CIRC_MISSING',
'UPDATE_BILL_NOTE',
'UPDATE_PATRON_CLAIM_NEVER_CHECKED_OUT_COUNT',
'UPDATE_PATRON_CLAIM_RETURN_COUNT',
@@ -2254,7 +2251,6 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
'SET_CIRC_CLAIMS_RETURNED',
'SET_CIRC_CLAIMS_RETURNED.override',
'SET_CIRC_LOST',
- 'SET_CIRC_MISSING',
'UNBAR_PATRON',
'UPDATE_BILL_NOTE',
'UPDATE_NON_CAT_TYPE',
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql
new file mode 100644
index 0000000..a7f2911
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql
@@ -0,0 +1,10 @@
+BEGIN;
+
+--delete all instances from permission.grp_perm_map first
+DELETE FROM permission.grp_perm_map where perm in
+(select id from permission.perm_list where code='SET_CIRC_MISSING');
+
+--delete from permission.perm_list
+DELETE FROM permission.perm_list where code='SET_CIRC_MISSING';
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 4 ----
.../upgrade/1041.data.remove_SET_CIRC_MISSING.sql | 16 ++++++++++++++++
3 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1041.data.remove_SET_CIRC_MISSING.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list