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

(-)a/C4/Biblio.pm (-9 / +13 lines)
Lines 1719-1734 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
		}
1731
        }
1732
		if ( $note ne $value ) {
1733
		    $note = $note . " " . $value;
1734
		}
1735
	}
1732
    }
1736
    }
1733
1737
1734
    if ($note) {
1738
    if ($note) {
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 388-390 INSERT INTO systempreferences (variable, value, options, explanation, type) VALU Link Here
388
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');
388
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');
389
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('alphabet','A B C D E F G H I J K L M N O P Q R S T U V W X Y Z','Alphabet than can be expanded into browse links, e.g. on Home > Patrons',NULL,'free');
389
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('alphabet','A B C D E F G H I J K L M N O P Q R S T U V W X Y Z','Alphabet than can be expanded into browse links, e.g. on Home > Patrons',NULL,'free');
390
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RefundLostItemFeeOnReturn', '1', 'If enabled, the lost item fee charged to a borrower will be refunded when the lost item is returned.', NULL, 'YesNo');
390
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RefundLostItemFeeOnReturn', '1', 'If enabled, the lost item fee charged to a borrower will be refunded when the lost item is returned.', NULL, 'YesNo');
391
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 6134-6139 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6134
    SetVersion ($DBversion);
6134
    SetVersion ($DBversion);
6135
}
6135
}
6136
6136
6137
$DBversion = "3.11.00.XXX";
6138
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6139
    $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')");
6140
    print "Upgrade to $DBversion done (Bug 9162 - Add a system preference to set which notes fields appears on title notes/description separator)\n";
6141
    SetVersion($DBversion);
6142
}
6143
6137
=head1 FUNCTIONS
6144
=head1 FUNCTIONS
6138
6145
6139
=head2 TableExists($table)
6146
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref (-2 / +5 lines)
Lines 156-159 Cataloging: Link Here
156
            - pref: OpacSuppressionByIPRange
156
            - pref: OpacSuppressionByIPRange
157
              class: short
157
              class: short
158
            - (Leave blank if not used. Define a range like <code>192.168.</code>.)
158
            - (Leave blank if not used. Define a range like <code>192.168.</code>.)
159
159
        -
160
            - Don't show these
161
            - pref: NotesBlacklist
162
              class: multi
163
            - 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)
160
- 

Return to bug 9162