@@ -, +, @@ --- catalogue/detail.pl | 8 ++++++++ catalogue/moredetail.pl | 1 + installer/data/mysql/updatedatabase.pl | 7 +++++++ .../prog/en/modules/catalogue/detail.tt | 4 +++- .../prog/en/modules/catalogue/moredetail.tt | 1 + 5 files changed, 20 insertions(+), 1 deletions(-) --- a/catalogue/detail.pl +++ a/catalogue/detail.pl @@ -224,6 +224,13 @@ foreach my $item (@items) { $item->{waitingdate} = format_date($wait_hashref->{waitingdate}); } + foreach my $f (qw( itemnotes nonpublicnote )) { + if ($item->{$f}) { + $item->{$f} =~ s|\n|
|g; + $itemfields{$f} = 1; + } + } + push @itemloop, $item; } @@ -242,6 +249,7 @@ $template->param( itemdata_copynumber => $itemfields{copynumber}, volinfo => $itemfields{enumchron}, itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_nonpublicnote => $itemfields{nonpublicnote}, z3950_search_params => C4::Search::z3950_search_args($dat), holdcount => $holdcount, C4::Search::enabled_staff_search_views, --- a/catalogue/moredetail.pl +++ a/catalogue/moredetail.pl @@ -145,6 +145,7 @@ foreach my $item (@items){ } else { $item->{'issue'}= 0; } + $item->{nonpublicnote} =~ s|\n|
|g if $item->{nonpublicnote}; } $template->param(count => $data->{'count'}, subscriptionsnumber => $subscriptionsnumber, --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -4332,6 +4332,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { SetVersion($DBversion); } +$DBversion = '3.05.00.XXX'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT"); + $dbh->do("UPDATE marc_subfield_structure SET kohafield='items.nonpublicnote' WHERE (kohafield IS NULL OR kohafield = '') AND tagfield='952' AND tagsubfield='x'"); + print "Upgrade to $DBversion done (Make nonpublicnote easier to use)\n"; +} + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -246,7 +246,8 @@ function verify_images() { [% IF ( volinfo ) %]Publication Details[% END %] [% IF ( itemdata_uri ) %]url[% END %] [% IF ( itemdata_copynumber ) %]Copy No.[% END %] - [% IF ( itemdata_itemnotes ) %]Public notes[% END %] + [% IF ( itemdata_itemnotes ) %]Public Notes[% END %] + [% IF ( itemdata_nonpublicnote ) %]Non-public Notes[% END %] [% IF ( SpineLabelShowPrintOnBibDetails ) %]Spine Label[% END %] [% FOREACH itemloo IN itemloop %] @@ -370,6 +371,7 @@ function verify_images() { [% itemloo.copynumber %] [% END %] [% IF ( itemdata_itemnotes ) %]
[% itemloo.itemnotes %]
[% END %] + [% IF ( itemdata_nonpublicnote ) %]
[% itemloo.nonpublicnote %]
[% END %] [% IF ( itemloo.type ) %] Fix Itemtype [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -173,6 +173,7 @@ [% IF ( ITEM_DAT.card1 ) %]
  • Previous Borrower: [% ITEM_DAT.card1 %] 
  • [% END %] [% IF ( ITEM_DAT.card2 ) %]
  • Previous Borrower: [% ITEM_DAT.card2 %] 
  • [% END %]
  • Paid for?: [% ITEM_DAT.paidfor %] 
  • +
  • Non-public Note: [% ITEM_DAT.nonpublicnote %] 
  • Serial enumeration: [% ITEM_DAT.enumchron %] 
  • Public Note: [% IF ( CAN_user_editcatalogue_edit_items ) %] --