Bugzilla – Attachment 2739 Details for
Bug 4222
Nonpublic note not appearing in the staff client
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch
0001-Bug-4222-allow-nonpublicnote-to-be-a-mapped-DB-colum.patch (text/plain), 6.19 KB, created by
Robin Sheat
on 2010-11-12 03:24:52 UTC
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Robin Sheat
Created:
2010-11-12 03:24:52 UTC
Size:
6.19 KB
patch
obsolete
>From d74b3921c4fdfa100fb2425abde51d45aff3229a Mon Sep 17 00:00:00 2001 >From: Robin Sheat <robin@catalyst.net.nz> >Date: Fri, 12 Nov 2010 16:14:10 +1300 >Subject: [PATCH] Bug 4222 - allow nonpublicnote to be a mapped DB column > >This means that it's possible (and easy) to put non-public notes >(usually 952$x) on a template, same as public notes. It creates a >mapping between the 952$x field and the new database column. > >Note that when this is applied, it will only work on newly saved records. > >It is possible this will need to be altered to allow for UNIMARC etc. if >they use 952 differently. >--- > 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(-) > >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index 4f6c23f..624a141 100755 >--- a/catalogue/detail.pl >+++ b/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|<br />|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, > ); >diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl >index d790c41..95598f7 100755 >--- a/catalogue/moredetail.pl >+++ b/catalogue/moredetail.pl >@@ -119,6 +119,7 @@ foreach my $item (@items){ > } else { > $item->{'issue'}= 0; > } >+ $item->{nonpublicnote} =~ s|\n|<br />|g if $item->{nonpublicnote}; > } > $template->param(count => $data->{'count'}, > subscriptionsnumber => $subscriptionsnumber, >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 27daa38..84d5428 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/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) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >index 1861028..a391744 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >@@ -211,6 +211,8 @@ function verify_images() { > <th>Status</th> > <th>Last seen</th> > <th>Barcode</th> >+ <!-- TMPL_IF NAME="itemdata_itemnotes" --><th>Public Note</th><!-- /TMPL_IF --> >+ <!-- TMPL_IF NAME="itemdata_nonpublicnote" --><th>Non-public Note</th><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="volinfo" --><th>Publication Details</th><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="itemdata_uri" --><th>URL</th><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="itemdata_copynumber" --><th>Copy No.</th><!-- /TMPL_IF --> >@@ -319,6 +321,8 @@ function verify_images() { > </td> > <td class="datelastseen"><!-- TMPL_VAR NAME="datelastseen" --></td> > <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber">"><!-- TMPL_VAR NAME="barcode" --></a></td> >+ <!-- TMPL_IF NAME="itemdata_itemnotes" --><td class="itemnotes"><!-- TMPL_VAR NAME="itemnotes" --></td><!-- /TMPL_IF --> >+ <!-- TMPL_IF NAME="itemdata_nonpublicnote" --><td class="nonpublicnote"><!-- TMPL_VAR NAME="nonpublicnote" --></td><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="volinfo" --> <td class="enumchron"> > <!-- TMPL_IF NAME="itemdata_enumchron" --> > <!-- TMPL_IF NAME="enumchron" --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl >index 55ca81f..f2a939b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl >@@ -166,6 +166,8 @@ > <!-- 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> </li><!-- /TMPL_IF --> > <!-- 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> </li><!-- /TMPL_IF --> > <li><span class="label">Paid for?:</span> <!-- TMPL_VAR NAME="paidfor" --> </li> >+ <li><span class="label">Non-public Note:</span> >+ <!-- TMPL_VAR NAME="nonpublicnote" --> </li> > <li><span class="label">Public Note:</span> > <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" --> > <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" /> >-- >1.7.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 4222
:
1918
|
2739
|
4350
|
4351
|
4746
|
4764
|
4765
|
4775
|
4832
|
4836
|
8048
|
10056
|
10057