[open-ils-commits] [GIT] Evergreen ILS branch master updated. bb0007e94e89d7ca1ef3725bcd97734fa2a86247
Evergreen Git
git at git.evergreen-ils.org
Sat Feb 11 19:07:57 EST 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 bb0007e94e89d7ca1ef3725bcd97734fa2a86247 (commit)
via 78066ca2e5f8fc5f3518248717bd800c1f6c9ce5 (commit)
via 6dcb169ac6f1d513c3baa8bd778934defa7ef9ed (commit)
via 9f74408f2dc7f1135bb1b32f1f3932a3c89798ad (commit)
from 9a932a0290e8c6d37c4582e58887c5ad2086fec1 (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 bb0007e94e89d7ca1ef3725bcd97734fa2a86247
Author: Ben Shum <ben at evergreener.net>
Date: Sat Feb 11 19:07:14 2017 -0500
LP#1455606: Add release note about removal of unused selfcheck password library setting
Just in case, added a quick release note about the removal of this setting.
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/docs/RELEASE_NOTES_NEXT/Administration/removed-unused-selfcheck-setting.adoc b/docs/RELEASE_NOTES_NEXT/Administration/removed-unused-selfcheck-setting.adoc
new file mode 100644
index 0000000..63cedeb
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Administration/removed-unused-selfcheck-setting.adoc
@@ -0,0 +1,7 @@
+Removed unused selfcheck password setting
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+There was an unused duplicate selfcheck password setting that was removed
+to avoid confusion over which library setting was supposed to be set to
+enable passwords for selfcheck. After upgrading, verify that your library
+policy remains consistent for this setting.
+
commit 78066ca2e5f8fc5f3518248717bd800c1f6c9ce5
Author: Ben Shum <ben at evergreener.net>
Date: Sat Feb 11 19:04:59 2017 -0500
LP#1455606: Stamping upgrade script for removing unused selfcheck password setting
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index e0e88fe..ed66ee3 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,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 ('1009', :eg_version); -- csharp/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1010', :eg_version); -- csharp/jeff/bshum
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql b/Open-ILS/src/sql/Pg/upgrade/1010.remove_unused_self_checkout_setting.sql
similarity index 92%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql
rename to Open-ILS/src/sql/Pg/upgrade/1010.remove_unused_self_checkout_setting.sql
index ac6bbe2..9c474c4 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1010.remove_unused_self_checkout_setting.sql
@@ -2,7 +2,7 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1010', :eg_version);
DELETE FROM actor.org_unit_setting WHERE name = 'circ.selfcheck.require_patron_password';
commit 6dcb169ac6f1d513c3baa8bd778934defa7ef9ed
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Wed Oct 12 07:05:32 2016 -0400
LP#1455606 - Also delete from config.org_unit_setting_type log.
As Ben Shum pointed out, the upgrade script will fail if entries
still exist for the removed setting, so we delete them too.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql
index 147f0e7..ac6bbe2 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql
@@ -8,6 +8,8 @@ DELETE FROM actor.org_unit_setting WHERE name = 'circ.selfcheck.require_patron_p
DELETE FROM config.org_unit_setting_type WHERE name = 'circ.selfcheck.require_patron_password';
+DELETE FROM config.org_unit_setting_type_log WHERE field_name = 'circ.selfcheck.require_patron_password';
+
DELETE FROM permission.usr_perm_map WHERE perm IN (SELECT id FROM permission.perm_list WHERE code = 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password');
DELETE FROM permission.grp_perm_map WHERE perm IN (SELECT id FROM permission.perm_list WHERE code = 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password');
commit 9f74408f2dc7f1135bb1b32f1f3932a3c89798ad
Author: Jeff Godin <jgodin at tadl.org>
Date: Thu May 14 16:58:18 2015 -0700
LP#1455606 remove unused self checkout setting
There is an unused (and apparently never used) org unit setting
related to self checkout:
circ.selfcheck.require_patron_password
This commit removes the redundant unused setting, related
permissions, and related strings.
Thanks to Lynn Floyd with the Anderson County Library for pointing
this out.
Signed-off-by: Jeff Godin <jgodin at tadl.org>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
Conflicts:
build/i18n/po/db.seed/db.seed.pot
Signed-off-by: Ben Shum <ben at evergreener.net>
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 a0171f1..52ac033 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1155,8 +1155,6 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.patron_login_timeout', 'ppl', 'description' )),
( 338, 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.alert_on_checkout_event', oils_i18n_gettext( 338,
'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.alert_on_checkout_event', 'ppl', 'description' )),
- ( 339, 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password', oils_i18n_gettext( 339,
- 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password', 'ppl', 'description' )),
( 340, 'UPDATE_ORG_UNIT_SETTING.global.juvenile_age_threshold', oils_i18n_gettext( 340,
'UPDATE_ORG_UNIT_SETTING.global.juvenile_age_threshold', 'ppl', 'description' )),
( 341, 'UPDATE_ORG_UNIT_SETTING.cat.bib.keep_on_empty', oils_i18n_gettext( 341,
@@ -3552,15 +3550,6 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'bool', null)
-,( 'circ.selfcheck.require_patron_password', 'self',
- oils_i18n_gettext('circ.selfcheck.require_patron_password',
- 'Require patron password',
- 'coust', 'label'),
- oils_i18n_gettext('circ.selfcheck.require_patron_password',
- 'If true, patrons will be required to enter their password in addition to their username/barcode to log into the selfcheck interface',
- 'coust', 'description'),
- 'bool', null)
-
,( 'circ.selfcheck.workstation_required', 'self',
oils_i18n_gettext('circ.selfcheck.workstation_required',
'Workstation Required',
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql
new file mode 100644
index 0000000..147f0e7
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql
@@ -0,0 +1,17 @@
+-- remove unused org unit setting for self checkout interface
+
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+DELETE FROM actor.org_unit_setting WHERE name = 'circ.selfcheck.require_patron_password';
+
+DELETE FROM config.org_unit_setting_type WHERE name = 'circ.selfcheck.require_patron_password';
+
+DELETE FROM permission.usr_perm_map WHERE perm IN (SELECT id FROM permission.perm_list WHERE code = 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password');
+
+DELETE FROM permission.grp_perm_map WHERE perm IN (SELECT id FROM permission.perm_list WHERE code = 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password');
+
+DELETE FROM permission.perm_list WHERE code = 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password';
+
+COMMIT;
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 3dd1b4a..4e39205 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2338,8 +2338,6 @@
<!ENTITY staff.server.admin.org_settings.circ.selfcheck.patron_login_timeout.desc "Number of seconds of inactivity before the patron is logged out of the selfcheck interface">
<!ENTITY staff.server.admin.org_settings.circ.selfcheck.alert_on_checkout_event "Selfcheck: Pop-up alert for errors">
<!ENTITY staff.server.admin.org_settings.circ.selfcheck.alert_on_checkout_event.desc "If true, checkout/renewal errors will cause a pop-up window in addition to the on-screen message">
-<!ENTITY staff.server.admin.org_settings.circ.selfcheck.require_patron_password "Selfcheck: Require patron password">
-<!ENTITY staff.server.admin.org_settings.circ.selfcheck.require_patron_password.desc "If true, patrons will be required to enter their password in addition to their username/barcode to log into the selfcheck interface">
<!ENTITY staff.server.admin.org_settings.global.juvenile_age_threshold "Juvenile Age Threshold">
<!ENTITY staff.server.admin.org_settings.global.juvenile_age_threshold.desc 'The age at which a user is no long considered a juvenile. For example, "18 years".'>
<!ENTITY staff.server.admin.org_settings.cat.bib.keep_on_empty "Do not automatically delete empty bib records">
diff --git a/build/i18n/po/db.seed/db.seed.pot b/build/i18n/po/db.seed/db.seed.pot
index 876e412..1f0a648 100644
--- a/build/i18n/po/db.seed/db.seed.pot
+++ b/build/i18n/po/db.seed/db.seed.pot
@@ -2907,11 +2907,6 @@ msgstr ""
msgid "Gayo"
msgstr ""
-# id::coust.label__circ.selfcheck.require_patron_password
-#: 950.data.seed-values.sql:3546
-msgid "Require patron password"
-msgstr ""
-
# id::ccvm.value__828 id::ccvm.value__856 id::ccvm.value__856
# id::ccvm.value__856 id::ccvm.value__856 id::ccvm.value__856
#: 950.data.seed-values.sql:7682 950.data.seed-values.sql:7712
@@ -6477,13 +6472,6 @@ msgstr ""
msgid "User may link a copy to an entry in a statistical category"
msgstr ""
-# id::coust.description__circ.selfcheck.require_patron_password
-#: 950.data.seed-values.sql:3549
-msgid ""
-"If true, patrons will be required to enter their password in addition to "
-"their username/barcode to log into the selfcheck interface"
-msgstr ""
-
# id::ccvm.value__893 id::ccvm.value__893 id::ccvm.value__893
#: 950.data.seed-values.sql:7753 950.data.seed-values.sql:8458
#: 950.data.seed-values.sql:8479
@@ -15644,11 +15632,6 @@ msgstr ""
msgid "Crimean Tatar"
msgstr ""
-# id::ppl.description__339
-#: 950.data.seed-values.sql:1155
-msgid "UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password"
-msgstr ""
-
# id::ccvm.value__441
#: 950.data.seed-values.sql:6866
msgid "Tsimshian"
diff --git a/build/i18n/po/lang.dtd/lang.dtd.pot b/build/i18n/po/lang.dtd/lang.dtd.pot
index ea56137..4c34dfb 100644
--- a/build/i18n/po/lang.dtd/lang.dtd.pot
+++ b/build/i18n/po/lang.dtd/lang.dtd.pot
@@ -9061,16 +9061,6 @@ msgid ""
"the on-screen message"
msgstr ""
-#: staff.server.admin.org_settings.circ.selfcheck.require_patron_password
-msgid "Selfcheck: Require patron password"
-msgstr ""
-
-#: staff.server.admin.org_settings.circ.selfcheck.require_patron_password.desc
-msgid ""
-"If true, patrons will be required to enter their password in addition to "
-"their username/barcode to log into the selfcheck interface"
-msgstr ""
-
#: staff.server.admin.org_settings.global.juvenile_age_threshold
msgid "Juvenile Age Threshold"
msgstr ""
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 11 -----------
.../1010.remove_unused_self_checkout_setting.sql | 19 +++++++++++++++++++
Open-ILS/web/opac/locale/en-US/lang.dtd | 2 --
build/i18n/po/db.seed/db.seed.pot | 17 -----------------
build/i18n/po/lang.dtd/lang.dtd.pot | 10 ----------
.../removed-unused-selfcheck-setting.adoc | 7 +++++++
7 files changed, 27 insertions(+), 41 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1010.remove_unused_self_checkout_setting.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/removed-unused-selfcheck-setting.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list