From e83d34e8c54baf42e584ba3c8f37cae2ef7e2180 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 17 Oct 2020 16:02:55 +0000 Subject: [PATCH] Bug 26638: Remove unused system preference ArticleRequestsMandatoryFieldsItemsOnly The preference was probably added because of a typo, as there is a used system preference ArticleRequestsMandatoryFieldsItemOnly (Item vs Items). This patch fixes the situation: - syspref.sql had the pref name with the typo, this is fixed. - A database update removes the unused variable and makes sure the used one is added. To test: - Look at the local use system preferences, verify the false pref is there - Look at the other ArticleRequests* preferences, verify the other without "s" is there - Apply patch and run database update - Verify the local use tab one is gone now Signed-off-by: Chris Cormack Signed-off-by: Martin Renvoize --- ...26638_ArticleRequestsMandatoryFieldsItemsOnly.perl | 11 +++++++++++ installer/data/mysql/mandatory/sysprefs.sql | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 installer/data/mysql/atomicupdate/bug_26638_ArticleRequestsMandatoryFieldsItemsOnly.perl diff --git a/installer/data/mysql/atomicupdate/bug_26638_ArticleRequestsMandatoryFieldsItemsOnly.perl b/installer/data/mysql/atomicupdate/bug_26638_ArticleRequestsMandatoryFieldsItemsOnly.perl new file mode 100644 index 0000000000..d95cf12e30 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_26638_ArticleRequestsMandatoryFieldsItemsOnly.perl @@ -0,0 +1,11 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES + ('ArticleRequestsMandatoryFieldsItemOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple') + }); + $dbh->do(q{ + DELETE FROM systempreferences WHERE variable = "ArticleRequestsMandatoryFieldsItemsOnly" + }); + NewVersion( $DBversion, 26638, "Add missing system preference ArticleRequestsMandatoryFieldsItemOnly"); +} diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 0e9f488055..c65b580a0c 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -57,7 +57,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('ArticleRequests', '0', NULL, 'Enables the article request feature', 'YesNo'), ('ArticleRequestsLinkControl', 'calc', 'always|calc', 'Control display of article request link on search results', 'Choice'), ('ArticleRequestsMandatoryFields', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''yes''', 'multiple'), -('ArticleRequestsMandatoryFieldsItemsOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple'), +('ArticleRequestsMandatoryFieldsItemOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple'), ('ArticleRequestsMandatoryFieldsRecordOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''bib_only''', 'multiple'), ('AudioAlerts','0','','Enable circulation sounds during checkin and checkout in the staff interface. Not supported by all web browsers yet.','YesNo'), ('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'), -- 2.20.1