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 395-397 INSERT INTO systempreferences (`variable`, `value`, `options`, `explanation`, `t Link Here
395
('PatronSelfRegistrationExpireTemporaryAccountsDelay', '0', NULL, 'If PatronSelfRegistrationDefaultCategory is enabled, this system preference controls how long a patron can have a temporary status before the account is deleted automatically. It is an integer value representing a number of days to wait before deleting a temporary patron account. Setting it to 0 disables the deleting of temporary accounts.', 'Integer'),
395
('PatronSelfRegistrationExpireTemporaryAccountsDelay', '0', NULL, 'If PatronSelfRegistrationDefaultCategory is enabled, this system preference controls how long a patron can have a temporary status before the account is deleted automatically. It is an integer value representing a number of days to wait before deleting a temporary patron account. Setting it to 0 disables the deleting of temporary accounts.', 'Integer'),
396
('PatronSelfRegistrationBorrowerMandatoryField',  'surname|firstname', NULL ,  'Choose the mandatory fields for a patron''s account, when registering via the OPAC.',  'free'),
396
('PatronSelfRegistrationBorrowerMandatoryField',  'surname|firstname', NULL ,  'Choose the mandatory fields for a patron''s account, when registering via the OPAC.',  'free'),
397
('PatronSelfRegistrationBorrowerUnwantedField',  '', NULL ,  'Name the fields you don''t want to display when registering a new patron via the OPAC.',  'free');
397
('PatronSelfRegistrationBorrowerUnwantedField',  '', NULL ,  'Name the fields you don''t want to display when registering a new patron via the OPAC.',  'free');
398
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 6285-6290 if (CheckVersion($DBversion)) { Link Here
6285
    SetVersion ($DBversion);
6285
    SetVersion ($DBversion);
6286
}
6286
}
6287
6287
6288
$DBversion = "3.11.00.XXX";
6289
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6290
    $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')");
6291
    print "Upgrade to $DBversion done (Bug 9162 - Add a system preference to set which notes fields appears on title notes/description separator)\n";
6292
    SetVersion($DBversion);
6293
}
6294
6288
=head1 FUNCTIONS
6295
=head1 FUNCTIONS
6289
6296
6290
=head2 TableExists($table)
6297
=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