@@ -, +, @@ --- catalogue/detail.pl | 9 +++++++++ catalogue/moredetail.pl | 1 + installer/data/mysql/updatedatabase.pl | 6 ++++++ .../prog/en/modules/catalogue/detail.tmpl | 4 ++++ .../prog/en/modules/catalogue/moredetail.tmpl | 2 ++ 5 files changed, 22 insertions(+), 0 deletions(-) --- a/catalogue/detail.pl +++ a/catalogue/detail.pl @@ -197,6 +197,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; } @@ -213,6 +220,8 @@ $template->param( itemdata_uri => $itemfields{uri}, itemdata_copynumber => $itemfields{copynumber}, volinfo => $itemfields{enumchron}, + itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_nonpublicnote => $itemfields{nonpublicnote}, z3950_search_params => C4::Search::z3950_search_args($dat), C4::Search::enabled_staff_search_views, ); --- a/catalogue/moredetail.pl +++ a/catalogue/moredetail.pl @@ -119,6 +119,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 @@ -3835,6 +3835,12 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = '3.03.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.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -211,6 +211,8 @@ function verify_images() { Status Last seen Barcode + Public Note + Non-public Note Publication Details URL Copy No. @@ -319,6 +321,8 @@ function verify_images() { &itemnumber=&biblionumber=&bi=#item + + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -166,6 +166,8 @@
  • Previous Borrower: "> 
  • Previous Borrower: "> 
  • Paid for?:  
  • +
  • Non-public Note: +  
  • Public Note:
    " /> --