@@ -, +, @@
---
catalogue/detail.pl | 10 +++++++++-
catalogue/moredetail.pl | 1 +
circ/returns.pl | 1 +
installer/data/mysql/kohastructure.sql | 2 ++
installer/data/mysql/updatedatabase.pl | 8 ++++++++
.../prog/en/modules/catalogue/detail.tt | 4 +++-
.../prog/en/modules/catalogue/moredetail.tt | 1 +
.../prog/en/modules/circ/circulation.tt | 8 ++++----
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 +
9 files changed, 30 insertions(+), 6 deletions(-)
--- a/catalogue/detail.pl
+++ a/catalogue/detail.pl
@@ -223,6 +223,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;
}
@@ -240,7 +247,8 @@ $template->param(
itemdata_uri => $itemfields{uri},
itemdata_copynumber => $itemfields{copynumber},
volinfo => $itemfields{enumchron},
- itemdata_itemnotes => $itemfields{itemnotes},
+ 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/circ/returns.pl
+++ a/circ/returns.pl
@@ -573,6 +573,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
$ri{itemcallnumber} = $biblio->{'itemcallnumber'};
$ri{itemtype} = $biblio->{'itemtype'};
$ri{itemnote} = $biblio->{'itemnotes'};
+ $ri{nonpublicnote} = $biblio->{'nonpublicnote'};
$ri{ccode} = $biblio->{'ccode'};
$ri{itemnumber} = $biblio->{'itemnumber'};
$ri{barcode} = $bar_code;
--- a/installer/data/mysql/kohastructure.sql
+++ a/installer/data/mysql/kohastructure.sql
@@ -761,6 +761,7 @@ CREATE TABLE `deleteditems` (
`enumchron` text default NULL,
`copynumber` varchar(32) default NULL,
`stocknumber` varchar(32) default NULL,
+ `nonpublicnote` mediumtext default NULL,
`marc` longblob,
PRIMARY KEY (`itemnumber`),
KEY `delitembarcodeidx` (`barcode`),
@@ -1028,6 +1029,7 @@ CREATE TABLE `items` (
`enumchron` text default NULL,
`copynumber` varchar(32) default NULL,
`stocknumber` varchar(32) default NULL,
+ `nonpublicnote` mediumtext default NULL,
PRIMARY KEY (`itemnumber`),
UNIQUE KEY `itembarcodeidx` (`barcode`),
KEY `itemstocknumberidx` (`stocknumber`),
--- a/installer/data/mysql/updatedatabase.pl
+++ a/installer/data/mysql/updatedatabase.pl
@@ -4370,6 +4370,14 @@ 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("ALTER TABLE deleteditems 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
@@ -247,7 +247,8 @@ function verify_images() {
[% IF ( itemdata_uri ) %]