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@tadl.org>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Ben Shum <ben@evergreener.net>

Conflicts:
	build/i18n/po/db.seed/db.seed.pot

Signed-off-by: Ben Shum <ben@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 (file)
--- 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 (file)
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 (file)
--- 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 (file)
--- 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 (file)
--- 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 ""