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

(-)a/catalogue/detail.pl (+9 lines)
Lines 197-202 foreach my $item (@items) { Link Here
197
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
197
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
198
    }
198
    }
199
199
200
    foreach my $f (qw( itemnotes nonpublicnote )) {
201
        if ($item->{$f}) {
202
            $item->{$f} =~ s|\n|<br />|g;
203
            $itemfields{$f} = 1;
204
        }
205
    }
206
   
200
    push @itemloop, $item;
207
    push @itemloop, $item;
201
}
208
}
202
209
Lines 213-218 $template->param( Link Here
213
	itemdata_uri        => $itemfields{uri},
220
	itemdata_uri        => $itemfields{uri},
214
	itemdata_copynumber => $itemfields{copynumber},
221
	itemdata_copynumber => $itemfields{copynumber},
215
	volinfo				=> $itemfields{enumchron},
222
	volinfo				=> $itemfields{enumchron},
223
	itemdata_itemnotes  => $itemfields{itemnotes},
224
	itemdata_nonpublicnote  => $itemfields{nonpublicnote},
216
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
225
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
217
	C4::Search::enabled_staff_search_views,
226
	C4::Search::enabled_staff_search_views,
218
);
227
);
(-)a/catalogue/moredetail.pl (+1 lines)
Lines 119-124 foreach my $item (@items){ Link Here
119
    } else {
119
    } else {
120
        $item->{'issue'}= 0;
120
        $item->{'issue'}= 0;
121
    }
121
    }
122
    $item->{nonpublicnote} =~ s|\n|<br />|g if $item->{nonpublicnote};
122
}
123
}
123
$template->param(count => $data->{'count'},
124
$template->param(count => $data->{'count'},
124
	subscriptionsnumber => $subscriptionsnumber,
125
	subscriptionsnumber => $subscriptionsnumber,
(-)a/installer/data/mysql/updatedatabase.pl (+6 lines)
Lines 3835-3840 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3835
    SetVersion ($DBversion);
3835
    SetVersion ($DBversion);
3836
}
3836
}
3837
3837
3838
$DBversion = '3.03.00.XXX';
3839
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3840
    $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT");
3841
    $dbh->do("UPDATE marc_subfield_structure SET kohafield='items.nonpublicnote' WHERE (kohafield IS NULL OR kohafield = '') AND tagfield='952' AND tagsubfield='x'");
3842
    print "Upgrade to $DBversion done (Make nonpublicnote easier to use)\n";
3843
}
3838
=head1 FUNCTIONS
3844
=head1 FUNCTIONS
3839
3845
3840
=head2 DropAllForeignKeys($table)
3846
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl (+4 lines)
Lines 211-216 function verify_images() { Link Here
211
                <th>Status</th>
211
                <th>Status</th>
212
                <th>Last seen</th>
212
                <th>Last seen</th>
213
                <th>Barcode</th>
213
                <th>Barcode</th>
214
                <!-- TMPL_IF NAME="itemdata_itemnotes" --><th>Public Note</th><!-- /TMPL_IF -->
215
                <!-- TMPL_IF NAME="itemdata_nonpublicnote" --><th>Non-public Note</th><!-- /TMPL_IF -->
214
                <!-- TMPL_IF NAME="volinfo" --><th>Publication Details</th><!-- /TMPL_IF -->
216
                <!-- TMPL_IF NAME="volinfo" --><th>Publication Details</th><!-- /TMPL_IF -->
215
                <!-- TMPL_IF NAME="itemdata_uri" --><th>URL</th><!-- /TMPL_IF -->
217
                <!-- TMPL_IF NAME="itemdata_uri" --><th>URL</th><!-- /TMPL_IF -->
216
                <!-- TMPL_IF NAME="itemdata_copynumber" --><th>Copy No.</th><!-- /TMPL_IF -->
218
                <!-- TMPL_IF NAME="itemdata_copynumber" --><th>Copy No.</th><!-- /TMPL_IF -->
Lines 319-324 function verify_images() { Link Here
319
                    </td>
321
                    </td>
320
                    <td class="datelastseen"><!-- TMPL_VAR NAME="datelastseen" --></td>
322
                    <td class="datelastseen"><!-- TMPL_VAR NAME="datelastseen" --></td>
321
                    <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber">"><!-- TMPL_VAR NAME="barcode" --></a></td>
323
                    <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber">"><!-- TMPL_VAR NAME="barcode" --></a></td>
324
                    <!-- TMPL_IF NAME="itemdata_itemnotes" --><td class="itemnotes"><!-- TMPL_VAR NAME="itemnotes" --></td><!-- /TMPL_IF -->
325
                    <!-- TMPL_IF NAME="itemdata_nonpublicnote" --><td class="nonpublicnote"><!-- TMPL_VAR NAME="nonpublicnote" --></td><!-- /TMPL_IF -->
322
				<!-- TMPL_IF NAME="volinfo" -->	<td class="enumchron">
326
				<!-- TMPL_IF NAME="volinfo" -->	<td class="enumchron">
323
					<!-- TMPL_IF NAME="itemdata_enumchron" -->
327
					<!-- TMPL_IF NAME="itemdata_enumchron" -->
324
						<!-- TMPL_IF NAME="enumchron" -->
328
						<!-- TMPL_IF NAME="enumchron" -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl (-1 / +2 lines)
Lines 166-171 Link Here
166
                <!-- TMPL_IF NAME="card1" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower1" -->"><!-- TMPL_VAR NAME="card1" --></a>&nbsp;</li><!-- /TMPL_IF -->
166
                <!-- TMPL_IF NAME="card1" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower1" -->"><!-- TMPL_VAR NAME="card1" --></a>&nbsp;</li><!-- /TMPL_IF -->
167
		<!-- TMPL_IF NAME="card2" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower2" -->"><!-- TMPL_VAR NAME="card2" --></a>&nbsp;</li><!-- /TMPL_IF -->
167
		<!-- TMPL_IF NAME="card2" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower2" -->"><!-- TMPL_VAR NAME="card2" --></a>&nbsp;</li><!-- /TMPL_IF -->
168
                <li><span class="label">Paid for?:</span> <!-- TMPL_VAR NAME="paidfor" -->&nbsp;</li>
168
                <li><span class="label">Paid for?:</span> <!-- TMPL_VAR NAME="paidfor" -->&nbsp;</li>
169
                <li><span class="label">Non-public Note:</span>
170
                    <!-- TMPL_VAR NAME="nonpublicnote" -->&nbsp;</li>
169
            <li><span class="label">Public Note:</span>
171
            <li><span class="label">Public Note:</span>
170
                <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
172
                <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
171
              <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
173
              <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
172
- 

Return to bug 4222