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

(-)a/catalogue/detail.pl (+8 lines)
Lines 224-229 foreach my $item (@items) { Link Here
224
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
224
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
225
    }
225
    }
226
226
227
    foreach my $f (qw( itemnotes nonpublicnote )) {
228
        if ($item->{$f}) {
229
            $item->{$f} =~ s|\n|<br />|g;
230
            $itemfields{$f} = 1;
231
        }
232
    }
233
227
    push @itemloop, $item;
234
    push @itemloop, $item;
228
}
235
}
229
236
Lines 242-247 $template->param( Link Here
242
	itemdata_copynumber => $itemfields{copynumber},
249
	itemdata_copynumber => $itemfields{copynumber},
243
	volinfo				=> $itemfields{enumchron},
250
	volinfo				=> $itemfields{enumchron},
244
    itemdata_itemnotes  => $itemfields{itemnotes},
251
    itemdata_itemnotes  => $itemfields{itemnotes},
252
	itemdata_nonpublicnote  => $itemfields{nonpublicnote},
245
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
253
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
246
    holdcount           => $holdcount,
254
    holdcount           => $holdcount,
247
	C4::Search::enabled_staff_search_views,
255
	C4::Search::enabled_staff_search_views,
(-)a/catalogue/moredetail.pl (+1 lines)
Lines 145-150 foreach my $item (@items){ Link Here
145
    } else {
145
    } else {
146
        $item->{'issue'}= 0;
146
        $item->{'issue'}= 0;
147
    }
147
    }
148
    $item->{nonpublicnote} =~ s|\n|<br />|g if $item->{nonpublicnote};
148
}
149
}
149
$template->param(count => $data->{'count'},
150
$template->param(count => $data->{'count'},
150
	subscriptionsnumber => $subscriptionsnumber,
151
	subscriptionsnumber => $subscriptionsnumber,
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 4332-4337 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
4332
    SetVersion($DBversion);
4332
    SetVersion($DBversion);
4333
}
4333
}
4334
4334
4335
$DBversion = '3.05.00.XXX';
4336
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4337
    $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT");
4338
    $dbh->do("UPDATE marc_subfield_structure SET kohafield='items.nonpublicnote' WHERE (kohafield IS NULL OR kohafield = '') AND tagfield='952' AND tagsubfield='x'");
4339
    print "Upgrade to $DBversion done (Make nonpublicnote easier to use)\n";
4340
}
4341
4335
=head1 FUNCTIONS
4342
=head1 FUNCTIONS
4336
4343
4337
=head2 DropAllForeignKeys($table)
4344
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +3 lines)
Lines 246-252 function verify_images() { Link Here
246
                [% IF ( volinfo ) %]<th>Publication Details</th>[% END %]
246
                [% IF ( volinfo ) %]<th>Publication Details</th>[% END %]
247
                [% IF ( itemdata_uri ) %]<th>url</th>[% END %]
247
                [% IF ( itemdata_uri ) %]<th>url</th>[% END %]
248
                [% IF ( itemdata_copynumber ) %]<th>Copy No.</th>[% END %]
248
                [% IF ( itemdata_copynumber ) %]<th>Copy No.</th>[% END %]
249
                [% IF ( itemdata_itemnotes ) %]<th>Public notes</th>[% END %]
249
                [% IF ( itemdata_itemnotes ) %]<th>Public Notes</th>[% END %]
250
                [% IF ( itemdata_nonpublicnote ) %]<th>Non-public Notes</th>[% END %]
250
		[% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine Label</th>[% END %]
251
		[% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine Label</th>[% END %]
251
            </tr>
252
            </tr>
252
            [% FOREACH itemloo IN itemloop %]
253
            [% FOREACH itemloo IN itemloop %]
Lines 370-375 function verify_images() { Link Here
370
					<td class="copynumber">[% itemloo.copynumber %]</td>
371
					<td class="copynumber">[% itemloo.copynumber %]</td>
371
				[% END %]
372
				[% END %]
372
                [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
373
                [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
374
                [% IF ( itemdata_nonpublicnote ) %]<td><div class="itemnotes">[% itemloo.nonpublicnote %]</div></td>[% END %]
373
                [% IF ( itemloo.type ) %]
375
                [% IF ( itemloo.type ) %]
374
                    <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=[% itemloo.biblioitemnumber %]&amp;item=[% itemloo.itemtype %]">Fix Itemtype</a></td>
376
                    <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=[% itemloo.biblioitemnumber %]&amp;item=[% itemloo.itemtype %]">Fix Itemtype</a></td>
375
                [% END %]
377
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-1 / +1 lines)
Lines 173-178 Link Here
173
                [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 %]">[% ITEM_DAT.card1 %]</a>&nbsp;</li>[% END %]
173
                [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 %]">[% ITEM_DAT.card1 %]</a>&nbsp;</li>[% END %]
174
		[% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
174
		[% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
175
                <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
175
                <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
176
                <li><span class="label">Non-public Note:<span> [% ITEM_DAT.nonpublicnote %]&nbsp;</li>
176
            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
177
            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
177
            <li><span class="label">Public Note:</span>
178
            <li><span class="label">Public Note:</span>
178
                [% IF ( CAN_user_editcatalogue_edit_items ) %]
179
                [% IF ( CAN_user_editcatalogue_edit_items ) %]
179
- 

Return to bug 4222