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

(-)a/catalogue/detail.pl (-1 / +9 lines)
Lines 223-228 foreach my $item (@items) { Link Here
223
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
223
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
224
    }
224
    }
225
225
226
    foreach my $f (qw( itemnotes nonpublicnote )) {
227
        if ($item->{$f}) {
228
            $item->{$f} =~ s|\n|<br />|g;
229
            $itemfields{$f} = 1;
230
        }
231
    }
232
   
226
    push @itemloop, $item;
233
    push @itemloop, $item;
227
}
234
}
228
235
Lines 240-246 $template->param( Link Here
240
	itemdata_uri        => $itemfields{uri},
247
	itemdata_uri        => $itemfields{uri},
241
	itemdata_copynumber => $itemfields{copynumber},
248
	itemdata_copynumber => $itemfields{copynumber},
242
	volinfo				=> $itemfields{enumchron},
249
	volinfo				=> $itemfields{enumchron},
243
    itemdata_itemnotes  => $itemfields{itemnotes},
250
	itemdata_itemnotes  => $itemfields{itemnotes},
251
	itemdata_nonpublicnote  => $itemfields{nonpublicnote},
244
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
252
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
245
    holdcount           => $holdcount,
253
    holdcount           => $holdcount,
246
	C4::Search::enabled_staff_search_views,
254
	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/circ/returns.pl (+1 lines)
Lines 575-580 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
575
        $ri{itemcallnumber}   = $biblio->{'itemcallnumber'};
575
        $ri{itemcallnumber}   = $biblio->{'itemcallnumber'};
576
        $ri{itemtype}         = $biblio->{'itemtype'};
576
        $ri{itemtype}         = $biblio->{'itemtype'};
577
        $ri{itemnote}         = $biblio->{'itemnotes'};
577
        $ri{itemnote}         = $biblio->{'itemnotes'};
578
        $ri{nonpublicnote}    = $biblio->{'nonpublicnote'};
578
        $ri{ccode}            = $biblio->{'ccode'};
579
        $ri{ccode}            = $biblio->{'ccode'};
579
        $ri{itemnumber}       = $biblio->{'itemnumber'};
580
        $ri{itemnumber}       = $biblio->{'itemnumber'};
580
        $ri{barcode}          = $bar_code;
581
        $ri{barcode}          = $bar_code;
(-)a/installer/data/mysql/kohastructure.sql (+2 lines)
Lines 745-750 CREATE TABLE `deleteditems` ( Link Here
745
  `reserves` smallint(6) default NULL,
745
  `reserves` smallint(6) default NULL,
746
  `restricted` tinyint(1) default NULL,
746
  `restricted` tinyint(1) default NULL,
747
  `itemnotes` mediumtext,
747
  `itemnotes` mediumtext,
748
  `nonpublicnote` mediumtext default NULL,
748
  `holdingbranch` varchar(10) default NULL,
749
  `holdingbranch` varchar(10) default NULL,
749
  `paidfor` mediumtext,
750
  `paidfor` mediumtext,
750
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
751
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
Lines 1012-1017 CREATE TABLE `items` ( Link Here
1012
  `reserves` smallint(6) default NULL,
1013
  `reserves` smallint(6) default NULL,
1013
  `restricted` tinyint(1) default NULL,
1014
  `restricted` tinyint(1) default NULL,
1014
  `itemnotes` mediumtext,
1015
  `itemnotes` mediumtext,
1016
  `nonpublicnote` mediumtext default NULL,
1015
  `holdingbranch` varchar(10) default NULL,
1017
  `holdingbranch` varchar(10) default NULL,
1016
  `paidfor` mediumtext,
1018
  `paidfor` mediumtext,
1017
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
1019
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 4391-4396 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4391
    SetVersion($DBversion);
4391
    SetVersion($DBversion);
4392
}
4392
}
4393
4393
4394
$DBversion = '3.05.00.XXX';
4395
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4396
    $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT AFTER itemnotes");
4397
    $dbh->do("ALTER TABLE deleteditems ADD COLUMN nonpublicnote MEDIUMTEXT AFTER itemnotes");
4398
    $dbh->do("UPDATE marc_subfield_structure SET kohafield='items.nonpublicnote' WHERE (kohafield IS NULL OR kohafield = '') AND tagfield='952' AND tagsubfield='x'");
4399
    print "Upgrade to $DBversion done (Make nonpublicnote easier to use. <b>If you have mapped your items to a MARC field other than 952 (system default), please check your Koha to MARC mapping for items.nonpublicnote</b>)\n";
4400
}
4401
4394
=head1 FUNCTIONS
4402
=head1 FUNCTIONS
4395
4403
4396
=head2 DropAllForeignKeys($table)
4404
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +3 lines)
Lines 247-253 function verify_images() { Link Here
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 ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine Label</th>[% END %]
250
                [% IF itemdata_nonpublicnote %]<th>Non-public Note</th>[% END %]
251
                [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine Label</th>[% END %]
251
            </tr>
252
            </tr>
252
            [% FOREACH itemloo IN itemloop %]
253
            [% FOREACH itemloo IN itemloop %]
253
                <tr>
254
                <tr>
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 class="nonpublicnote">[% itemloo.nonpublicnote %]</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 lines)
Lines 174-179 Link Here
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">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
176
            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
177
            [% IF ITEM_DAT.nonpublicnote %]<li><span class="label">Non-public Note:</span> [% ITEM_DAT.nonpublicnote %]&nbsp;</li>[% END %]
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
              <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
180
              <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-4 / +4 lines)
Lines 701-707 No patron matched <span class="ex">[% message %]</span> Link Here
701
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
701
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
702
        [% todayissue.dd %]
702
        [% todayissue.dd %]
703
        </td>
703
        </td>
704
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
704
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %][% IF ( todayissue.nonpublicnote ) %]- <span class="circ-hlt">[% todayissue.nonpublicnote %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
705
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
705
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
706
        <td>[% todayissue.checkoutdate %]</td>
706
        <td>[% todayissue.checkoutdate %]</td>
707
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.borrowername %]</td>[% END %]
707
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.borrowername %]</td>[% END %]
Lines 773-779 No patron matched <span class="ex">[% message %]</span> Link Here
773
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
773
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
774
        [% previssue.dd %]
774
        [% previssue.dd %]
775
        </td>
775
        </td>
776
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
776
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %][% IF ( previssue.nonpublicnote ) %]- [% previssue.nonpublicnote %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
777
        <td>
777
        <td>
778
            [% previssue.itemtype %]
778
            [% previssue.itemtype %]
779
        </td>
779
        </td>
Lines 879-885 No patron matched <span class="ex">[% message %]</span> Link Here
879
    [% END %]
879
    [% END %]
880
        [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
880
        [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
881
            [% relissue.dd %]</td>
881
            [% relissue.dd %]</td>
882
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
882
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %][% IF ( relissue.nonpublicnote ) %]- <span class="circ-hlt">[% relissue.nonpublicnote %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
883
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
883
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
884
        <td>[% relissue.displaydate %]</td>
884
        <td>[% relissue.displaydate %]</td>
885
        <td>[% relissue.itemcallnumber %]</td>
885
        <td>[% relissue.itemcallnumber %]</td>
Lines 899-905 No patron matched <span class="ex">[% message %]</span> Link Here
899
        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
899
        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
900
        [% relprevissue.dd %]
900
        [% relprevissue.dd %]
901
        </td>
901
        </td>
902
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
902
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %][% IF ( relprevissue.nonpublicnote ) %] - [% relprevissue.nonpublicnote %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
903
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
903
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
904
        <td>[% relprevissue.displaydate %]</td>
904
        <td>[% relprevissue.displaydate %]</td>
905
        <td>[% relprevissue.itemcallnumber %]</td>
905
        <td>[% relprevissue.itemcallnumber %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 422-427 function Dopop(link) { Link Here
422
            [% ELSE %]Not checked out[% END %]</td>
422
            [% ELSE %]Not checked out[% END %]</td>
423
            <td>[% IF ( riloo.bornote ) %]<span class="circ-hlt">[% riloo.bornote %]<br /></span>[% END %]
423
            <td>[% IF ( riloo.bornote ) %]<span class="circ-hlt">[% riloo.bornote %]<br /></span>[% END %]
424
            [% IF ( riloo.itemnote ) %]<span class="circ-hlt">[% riloo.itemnote %]</span>[% END %]
424
            [% IF ( riloo.itemnote ) %]<span class="circ-hlt">[% riloo.itemnote %]</span>[% END %]
425
            [% IF ( riloo.nonpublicnote ) %]<span class="circ-hlt">[% riloo.nonpublicnote %]</span>[% END %]
425
            </td>
426
            </td>
426
           </tr>
427
           </tr>
427
        [% END %]
428
        [% END %]
428
- 

Return to bug 4222