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

(-)a/C4/Biblio.pm (-8 / +12 lines)
Lines 1719-1733 sub GetMarcNotes { Link Here
1719
    my $note = "";
1719
    my $note = "";
1720
    my $tag  = "";
1720
    my $tag  = "";
1721
    my $marcnote;
1721
    my $marcnote;
1722
    my %blacklist = map { $_ => 1 } split(/,/,C4::Context->preference('NotesBlacklist'));
1722
    foreach my $field ( $record->field($scope) ) {
1723
    foreach my $field ( $record->field($scope) ) {
1723
        my $value = $field->as_string();
1724
        my $tag = $field->tag();
1724
        if ( $note ne "" ) {
1725
        if (!$blacklist{$tag}) {
1725
            $marcnote = { marcnote => $note, };
1726
            my $value = $field->as_string();
1726
            push @marcnotes, $marcnote;
1727
            if ( $note ne "" ) {
1727
            $note = $value;
1728
                $marcnote = { marcnote => $note, };
1728
        }
1729
                push @marcnotes, $marcnote;
1729
        if ( $note ne $value ) {
1730
                $note = $value;
1730
            $note = $note . " " . $value;
1731
            }
1732
            if ( $note ne $value ) {
1733
                $note = $note . " " . $value;
1734
            }
1731
        }
1735
        }
1732
    }
1736
    }
1733
1737
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 400-402 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
400
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSeparateHoldings', '0', 'Separate current branch holdings from other holdings (OPAC)', NULL, 'YesNo');
400
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSeparateHoldings', '0', 'Separate current branch holdings from other holdings (OPAC)', NULL, 'YesNo');
401
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSeparateHoldingsBranch', 'homebranch', 'Branch used to separate holdings (OPAC)', 'homebranch|holdingbranch', 'Choice');
401
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSeparateHoldingsBranch', 'homebranch', 'Branch used to separate holdings (OPAC)', 'homebranch|holdingbranch', 'Choice');
402
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RenewalSendNotice','0', NULL, '', 'YesNo');
402
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RenewalSendNotice','0', NULL, '', 'YesNo');
403
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');
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 6309-6314 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
6309
    SetVersion($DBversion);
6309
    SetVersion($DBversion);
6310
}
6310
}
6311
6311
6312
$DBversion = "3.11.00.XXX";
6313
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6314
    $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')");
6315
    print "Upgrade to $DBversion done (Bug 9162 - Add a system preference to set which notes fields appears on title notes/description separator)\n";
6316
    SetVersion($DBversion);
6317
}
6318
6312
=head1 FUNCTIONS
6319
=head1 FUNCTIONS
6313
6320
6314
=head2 TableExists($table)
6321
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref (-1 / +5 lines)
Lines 167-169 Cataloging: Link Here
167
                homebranch: 'home branch'
167
                homebranch: 'home branch'
168
                holdingbranch: 'holding branch'
168
                holdingbranch: 'holding branch'
169
            - 'is the branch of user logged in. The other tab contains other items.'
169
            - 'is the branch of user logged in. The other tab contains other items.'
170
- 
170
        -
171
            - Don't show these
172
            - pref: NotesBlacklist
173
              class: multi
174
            - note fields in title notes separator (OPAC record details) and in the description separator (Staff client record details). The fields should appear separated with commas and according with the Koha MARC format (eg 3.. for UNIMARC, 5.. for MARC21)

Return to bug 9162