From aeb39a61bdef62a0cef6413b9cebcd60b83196f9 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 6 Jul 2020 17:56:35 +0000 Subject: [PATCH] Bug 25709: Rename systempreference to NotesToHide In an effort to use more inclusive language we have added a new coding guideline: https://wiki.koha-community.org/wiki/Coding_Guidelines#TERM3:_Inclusive_Language This patchset renames a syspref to be clearer and follow the guideline To test: 1 - Apply patch and updatedatabase 2 - git grep NotesBlacklist 3 - Note all remaining occurrences are translations, db updates, and release notes 4 - Add a field (e.g. '520' ) to the NotesToHide systempreference 5 - View a record with a 520 field on the opac 6 - Confirm the field does not show in the 'Title notes' tab Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 5e45076c00b2f72537ba9c81c4535253f1aaadfb) Signed-off-by: Lucas Gass (cherry picked from commit f00ce94d94b079a9e8e326ea3bad99e5567d93f2) Signed-off-by: Aleisha Amohia --- C4/Biblio.pm | 6 +++--- .../mysql/atomicupdate/rename_preference_NotesToHide.perl | 6 ++++++ installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/cataloguing.pref | 2 +- t/Biblio/GetMarcNotes.t | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/rename_preference_NotesToHide.perl diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 51c62874ba..c8fd02e81c 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -1519,11 +1519,11 @@ sub GetMarcNotes { 590 => 1 ); - my %blacklist = map { $_ => 1 } - split( /,/, C4::Context->preference('NotesBlacklist')); + my %hiddenlist = map { $_ => 1 } + split( /,/, C4::Context->preference('NotesToHide')); foreach my $field ( $record->field($scope) ) { my $tag = $field->tag(); - next if $blacklist{ $tag }; + next if $hiddenlist{ $tag }; next if $opac && $maybe_private{$tag} && !$field->indicator(1); if( $marcflavour ne 'UNIMARC' && $field->subfield('u') ) { # Field 5XX$u always contains URI diff --git a/installer/data/mysql/atomicupdate/rename_preference_NotesToHide.perl b/installer/data/mysql/atomicupdate/rename_preference_NotesToHide.perl new file mode 100644 index 0000000000..373bf966ef --- /dev/null +++ b/installer/data/mysql/atomicupdate/rename_preference_NotesToHide.perl @@ -0,0 +1,6 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do( "UPDATE systempreferences SET variable='NotesToHide' WHERE variable = 'NotesBlacklist'" ); + print "Bug 25709: Rename systempreference to NotesToHide\n"; + SetVersion( $DBversion ); +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index bab958d88e..be1f8e1bb3 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -328,7 +328,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('NoIssuesChargeGuarantees','','','Define maximum amount withstanding before check outs are blocked','Integer'), ('noItemTypeImages','0',NULL,'If ON, disables item-type images','YesNo'), ('NoRenewalBeforePrecision','exact_time','date|exact_time','Calculate "No renewal before" based on date only or exact time of due date','Choice'), -('NotesBlacklist','',NULL,'List of notes fields that should not appear in the title notes/description separator of details','free'), +('NotesToHide','',NULL,'List of notes fields that should not appear in the title notes/description separator of details','free'), ('NotHighlightedWords','and|or|not',NULL,'List of words to NOT highlight when OpacHitHighlight is enabled','free'), ('NoticeBcc','','','Email address to bcc outgoing notices sent by email','free'), ('NoticeCSS','',NULL,'Notices CSS url.','free'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref index 388fd29d71..43bdbde417 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref @@ -230,7 +230,7 @@ Cataloging: - "is the logged in user's library. The second tab will contain all other items." - - "Don't show" - - pref: NotesBlacklist + - pref: NotesToHide class: multi - "note fields in the 'Title notes' tab and in the 'Description' tab on the OPAC and staff interface detail pages. Use a comma to separate multiple fields. Examples: 500,502 (MARC21); 300,328 (UNIMARC)." -
diff --git a/t/Biblio/GetMarcNotes.t b/t/Biblio/GetMarcNotes.t index bb55226bdc..ccd368d346 100755 --- a/t/Biblio/GetMarcNotes.t +++ b/t/Biblio/GetMarcNotes.t @@ -27,7 +27,7 @@ use C4::Biblio; subtest 'GetMarcNotes MARC21' => sub { plan tests => 11; - t::lib::Mocks::mock_preference( 'NotesBlacklist', '520' ); + t::lib::Mocks::mock_preference( 'NotesToHide', '520' ); my $record = MARC::Record->new; $record->append_fields( @@ -55,7 +55,7 @@ subtest 'GetMarcNotes MARC21' => sub { subtest 'GetMarcNotes UNIMARC' => sub { plan tests => 3; - t::lib::Mocks::mock_preference( 'NotesBlacklist', '310' ); + t::lib::Mocks::mock_preference( 'NotesToHide', '310' ); my $record = MARC::Record->new; $record->append_fields( -- 2.39.5