From e007ce429421bda8ca57806f11b6ea9fc32c0f6d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 25 Jul 2022 15:34:47 +0200 Subject: [PATCH] Bug 30588: Add 'enforced' option to TwoFactorAuthentication Sponsored-by: Rijksmuseum, Netherlands Signed-off-by: Nick Clemens --- installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/staff_interface.pref | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 68b6841c12..d1859c9345 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -729,7 +729,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('TransferWhenCancelAllWaitingHolds','0',NULL,'Transfer items when cancelling all waiting holds','YesNo'), ('TranslateNotices','0',NULL, 'Allow notices to be translated','YesNo'), ('TrapHoldsOnOrder','1',NULL,'If enabled, Koha will trap holds for on order items ( notforloan < 0 )','YesNo'), -('TwoFactorAuthentication', '0', 'NULL', 'Enables two-factor authentication', 'YesNo'), +('TwoFactorAuthentication', 'disable', 'enforce|enabled|disabled', 'Enables two-factor authentication', 'Choice'), ('UNIMARCAuthorityField100','afrey50 ba0',NULL,'Define the contents of UNIMARC authority control field 100 position 08-35','Textarea'), ('UNIMARCAuthorsFacetsSeparator',', ',NULL,'UNIMARC authors facets separator','short'), ('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref index 32473520c4..29c51d8d16 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref @@ -209,6 +209,7 @@ Staff interface: - - pref: TwoFactorAuthentication choices: - 1: Enable - 0: "Don't enable" - - two-factor authentication (2FA). + "enforce": Enforce + "enable": Enable + "disable": "Don't enable" + - two-factor authentication (2FA) for staff members. -- 2.30.2