Bug 13024 - Nonpublic note not appearing in the staff client

[koha.git] / catalogue / updateitem.pl

diff --git a/catalogue/updateitem.pl b/catalogue/updateitem.pl
index 379c12c..90c6de6 100755 (executable)
--- a/catalogue/updateitem.pl
+++ b/catalogue/updateitem.pl
@@ -5,21 +5,21 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 use strict; 
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Context;
 use C4::Biblio;
@@ -30,14 +30,15 @@ use C4::Reserves;
 
 my $cgi= new CGI;
 
-my ($loggedinuser, $cookie, $sessionID) = checkauth($cgi, 0, {circulate => 'circulate_remaining_permissions'}, 'intranet');
+checkauth($cgi, 0, {circulate => 'circulate_remaining_permissions'}, 'intranet');
 
 my $biblionumber=$cgi->param('biblionumber');
 my $itemnumber=$cgi->param('itemnumber');
 my $biblioitemnumber=$cgi->param('biblioitemnumber');
 my $itemlost=$cgi->param('itemlost');
 my $itemnotes=$cgi->param('itemnotes');
-my $wthdrawn=$cgi->param('wthdrawn');
+my $itemnotes_nonpublic=$cgi->param('itemnotes_nonpublic');
+my $withdrawn=$cgi->param('withdrawn');
 my $damaged=$cgi->param('damaged');
 
 my $confirm=$cgi->param('confirm');
@@ -47,7 +48,7 @@ my $dbh = C4::Context->dbh;
 my $item_data_hashref = GetItem($itemnumber, undef);
 
 # make sure item statuses are set to 0 if empty or NULL
-for ($damaged,$itemlost,$wthdrawn) {
+for ($damaged,$itemlost,$withdrawn) {
     if (!$_ or $_ eq "") {
         $_ = 0;
     }
@@ -55,15 +56,21 @@ for ($damaged,$itemlost,$wthdrawn) {
 
 # modify MARC item if input differs from items table.
 my $item_changes = {};
-if (defined $itemnotes) { # i.e., itemnotes parameter passed from form
-    my ($loggedinuser, $cookie, $sessionID) = checkauth($cgi, 0, {editcatalogue => 'edit_items'}, 'intranet');
+if (defined $itemnotes_nonpublic) { # i.e., itemnotes_nonpublic parameter passed from form
+    checkauth($cgi, 0, {editcatalogue => 'edit_items'}, 'intranet');
+    if ((not defined  $item_data_hashref->{'itemnotes_nonpublic'}) or $itemnotes_nonpublic ne $item_data_hashref->{'itemnotes_nonpublic'}) {
+        $item_changes->{'itemnotes_nonpublic'} = $itemnotes_nonpublic;
+    }
+}
+elsif (defined $itemnotes) { # i.e., itemnotes parameter passed from form
+    checkauth($cgi, 0, {editcatalogue => 'edit_items'}, 'intranet');
     if ((not defined  $item_data_hashref->{'itemnotes'}) or $itemnotes ne $item_data_hashref->{'itemnotes'}) {
         $item_changes->{'itemnotes'} = $itemnotes;
     }
 } elsif ($itemlost ne $item_data_hashref->{'itemlost'}) {
     $item_changes->{'itemlost'} = $itemlost;
-} elsif ($wthdrawn ne $item_data_hashref->{'wthdrawn'}) {
-    $item_changes->{'wthdrawn'} = $wthdrawn;
+} elsif ($withdrawn ne $item_data_hashref->{'withdrawn'}) {
+    $item_changes->{'withdrawn'} = $withdrawn;
 } elsif ($damaged ne $item_data_hashref->{'damaged'}) {
     $item_changes->{'damaged'} = $damaged;
 } else {