View | Details | Raw Unified | Return to bug 25709
Collapse All | Expand All

(-)a/C4/Biblio.pm (-3 / +3 lines)
Lines 1513-1523 sub GetMarcNotes { Link Here
1513
        590 => 1
1513
        590 => 1
1514
    );
1514
    );
1515
1515
1516
    my %blacklist = map { $_ => 1 }
1516
    my %denylist = map { $_ => 1 }
1517
        split( /,/, C4::Context->preference('NotesBlacklist'));
1517
        split( /,/, C4::Context->preference('NotesDenylist'));
1518
    foreach my $field ( $record->field($scope) ) {
1518
    foreach my $field ( $record->field($scope) ) {
1519
        my $tag = $field->tag();
1519
        my $tag = $field->tag();
1520
        next if $blacklist{ $tag };
1520
        next if $denylist{ $tag };
1521
        next if $opac && $maybe_private{$tag} && !$field->indicator(1);
1521
        next if $opac && $maybe_private{$tag} && !$field->indicator(1);
1522
        if( $marcflavour ne 'UNIMARC' && $field->subfield('u') ) {
1522
        if( $marcflavour ne 'UNIMARC' && $field->subfield('u') ) {
1523
            # Field 5XX$u always contains URI
1523
            # Field 5XX$u always contains URI
(-)a/installer/data/mysql/atomicupdate/rename_preference_NotesDenylist.perl (+5 lines)
Line 0 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do( "UPDATE systempreferences SET variable='NotesDenylist' WHERE variable = 'NotesBlacklist'" );
4
    NewVersion( $DBversion, 25709, "Rename systempreference to NotesDenylist");
5
}
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 333-339 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
333
('NoIssuesChargeGuarantees','','','Define maximum amount withstanding before check outs are blocked','Integer'),
333
('NoIssuesChargeGuarantees','','','Define maximum amount withstanding before check outs are blocked','Integer'),
334
('noItemTypeImages','0',NULL,'If ON, disables itemtype images in the staff interface','YesNo'),
334
('noItemTypeImages','0',NULL,'If ON, disables itemtype images in the staff interface','YesNo'),
335
('NoRenewalBeforePrecision','exact_time','date|exact_time','Calculate "No renewal before" based on date only or exact time of due date','Choice'),
335
('NoRenewalBeforePrecision','exact_time','date|exact_time','Calculate "No renewal before" based on date only or exact time of due date','Choice'),
336
('NotesBlacklist','',NULL,'List of notes fields that should not appear in the title notes/description separator of details','free'),
336
('NotesDenylist','',NULL,'List of notes fields that should not appear in the title notes/description separator of details','free'),
337
('NotHighlightedWords','and|or|not',NULL,'List of words to NOT highlight when OpacHitHighlight is enabled','free'),
337
('NotHighlightedWords','and|or|not',NULL,'List of words to NOT highlight when OpacHitHighlight is enabled','free'),
338
('NoticeBcc','','','Email address to bcc outgoing notices sent by email','free'),
338
('NoticeBcc','','','Email address to bcc outgoing notices sent by email','free'),
339
('NoticeCSS','',NULL,'Notices CSS url.','free'),
339
('NoticeCSS','',NULL,'Notices CSS url.','free'),
(-)a/installer/data/mysql/updatedatabase.pl (-1 / +1 lines)
Lines 6377-6383 if ( CheckVersion($DBversion) ) { Link Here
6377
6377
6378
$DBversion = "3.11.00.013";
6378
$DBversion = "3.11.00.013";
6379
if ( CheckVersion($DBversion) ) {
6379
if ( CheckVersion($DBversion) ) {
6380
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('NotesBlacklist','','List of notes fields that should not appear in the title notes/description separator of details',NULL,'free')");
6380
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('NotesDenylist','','List of notes fields that should not appear in the title notes/description separator of details',NULL,'free')");
6381
    print "Upgrade to $DBversion done (Bug 9162 - Add a system preference to set which notes fields appears on title notes/description separator)\n";
6381
    print "Upgrade to $DBversion done (Bug 9162 - Add a system preference to set which notes fields appears on title notes/description separator)\n";
6382
    SetVersion($DBversion);
6382
    SetVersion($DBversion);
6383
}
6383
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref (-1 / +1 lines)
Lines 231-237 Cataloging: Link Here
231
            - "is the logged in user's library. The second tab will contain all other items."
231
            - "is the logged in user's library. The second tab will contain all other items."
232
        -
232
        -
233
            - "Don't show"
233
            - "Don't show"
234
            - pref: NotesBlacklist
234
            - pref: NotesDenylist
235
              class: multi
235
              class: multi
236
            - "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)."
236
            - "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)."
237
            - <br />
237
            - <br />
(-)a/misc/release_notes/release_notes_20_05_00.html (-1 / +1 lines)
Lines 2029-2035 have already been fixed in maintainance releases)</p> Link Here
2029
<li><p><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17221">[17221]</a> Orphan comma in shelf browser</p>
2029
<li><p><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17221">[17221]</a> Orphan comma in shelf browser</p>
2030
2030
2031
<p><strong>Sponsored by</strong> <em>California College of the Arts</em></p></li>
2031
<p><strong>Sponsored by</strong> <em>California College of the Arts</em></p></li>
2032
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17697">[17697]</a> Improve NotesBlacklist system preference description to make clear where it will apply</li>
2032
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17697">[17697]</a> Improve NotesDenylist system preference description to make clear where it will apply</li>
2033
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17853">[17853]</a> MARC21: Don't remove () from link text for 780/785</li>
2033
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17853">[17853]</a> MARC21: Don't remove () from link text for 780/785</li>
2034
<li><p><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17938">[17938]</a> XSLT: Label of 583 is repeated for multiple tags and private notes don't display in staff</p>
2034
<li><p><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17938">[17938]</a> XSLT: Label of 583 is repeated for multiple tags and private notes don't display in staff</p>
2035
2035
(-)a/misc/release_notes/release_notes_20_05_00.md (-1 / +1 lines)
Lines 1554-1560 have already been fixed in maintainance releases) Link Here
1554
- [[17221]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17221) Orphan comma in shelf browser
1554
- [[17221]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17221) Orphan comma in shelf browser
1555
1555
1556
  **Sponsored by** *California College of the Arts*
1556
  **Sponsored by** *California College of the Arts*
1557
- [[17697]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17697) Improve NotesBlacklist system preference description to make clear where it will apply
1557
- [[17697]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17697) Improve NotesDenylist system preference description to make clear where it will apply
1558
- [[17853]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17853) MARC21: Don't remove () from link text for 780/785
1558
- [[17853]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17853) MARC21: Don't remove () from link text for 780/785
1559
- [[17938]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17938) XSLT: Label of 583 is repeated for multiple tags and private notes don't display in staff
1559
- [[17938]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17938) XSLT: Label of 583 is repeated for multiple tags and private notes don't display in staff
1560
1560
(-)a/misc/release_notes/release_notes_3_12_0.txt (-1 / +1 lines)
Lines 982-988 New sysprefs in 3.12.0 Link Here
982
  * IDreamBooksReviews
982
  * IDreamBooksReviews
983
  * IntranetNumbersPreferPhrase
983
  * IntranetNumbersPreferPhrase
984
  * ManInvInNoissuesCharge
984
  * ManInvInNoissuesCharge
985
  * NotesBlacklist
985
  * NotesDenylist
986
  * OpacItemLocation
986
  * OpacItemLocation
987
  * OPACNumbersPreferPhrase
987
  * OPACNumbersPreferPhrase
988
  * OpacSeparateHoldings
988
  * OpacSeparateHoldings
(-)a/t/Biblio/GetMarcNotes.t (-3 / +2 lines)
Lines 27-33 use C4::Biblio; Link Here
27
27
28
subtest 'GetMarcNotes MARC21' => sub {
28
subtest 'GetMarcNotes MARC21' => sub {
29
    plan tests => 11;
29
    plan tests => 11;
30
    t::lib::Mocks::mock_preference( 'NotesBlacklist', '520' );
30
    t::lib::Mocks::mock_preference( 'NotesDenylist', '520' );
31
31
32
    my $record = MARC::Record->new;
32
    my $record = MARC::Record->new;
33
    $record->append_fields(
33
    $record->append_fields(
Lines 55-61 subtest 'GetMarcNotes MARC21' => sub { Link Here
55
55
56
subtest 'GetMarcNotes UNIMARC' => sub {
56
subtest 'GetMarcNotes UNIMARC' => sub {
57
    plan tests => 3;
57
    plan tests => 3;
58
    t::lib::Mocks::mock_preference( 'NotesBlacklist', '310' );
58
    t::lib::Mocks::mock_preference( 'NotesDenylist', '310' );
59
59
60
    my $record = MARC::Record->new;
60
    my $record = MARC::Record->new;
61
    $record->append_fields(
61
    $record->append_fields(
62
- 

Return to bug 25709