Kyle M Hall
7d15ff3404
Adding an item to course reserves and trying to edit any values in a second step does not work. Values are not saved and the table shows all values as "Unchanged". This patch set adds two new sets of columns to the course_items table. The first set determines if the specified column should be swapped or not. The was previously 'implied' by the column being set to undef which has been the root problem with that way of knowing if a column should swap or not. The second set of new columns are for storing the item field values while the item is on course reserve. Previously, the column values were swapped between the items table and the course_items table, which leaves ambiguity as to what each value is. Now, the original columns *always* store the value when the item is on course reserve, and the new storage columns store the original item value while the item is on reserve, and are NULL when an item is *not* on reserve. Test Plan: 1) Apply this patch 2) Add and edit course items, not the new checkboxes for enabling fields 3) Everything should function as before Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
129 lines
4.3 KiB
Perl
Executable file
129 lines
4.3 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#
|
|
# Copyright 2012 Bywater Solutions
|
|
#
|
|
# 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 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.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Koha;
|
|
use C4::Biblio;
|
|
use Koha::Items;
|
|
|
|
use C4::CourseReserves qw(GetCourse GetCourseItem GetCourseReserve ModCourseItem ModCourseReserve);
|
|
|
|
use Koha::Items;
|
|
use Koha::ItemTypes;
|
|
|
|
my $cgi = new CGI;
|
|
|
|
my $action = $cgi->param('action') || '';
|
|
my $course_id = $cgi->param('course_id') || '';
|
|
my $barcode = $cgi->param('barcode') || '';
|
|
my $return = $cgi->param('return') || '';
|
|
my $itemnumber = $cgi->param('itemnumber') || '';
|
|
my $is_edit = $cgi->param('is_edit') || '';
|
|
|
|
my $item = Koha::Items->find( { ( $itemnumber ? ( itemnumber => $itemnumber ) : ( barcode => $barcode ) ) } );
|
|
$itemnumber = $item->id if $item;
|
|
|
|
my $title = ($item) ? $item->biblio->title : undef;
|
|
|
|
my $step = ( $action eq 'lookup' && $item ) ? '2' : '1';
|
|
|
|
my $tmpl = ($course_id) ? "add_items-step$step.tt" : "invalid-course.tt";
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{ template_name => "course_reserves/$tmpl",
|
|
query => $cgi,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { coursereserves => 'add_reserves' },
|
|
}
|
|
);
|
|
|
|
if ( !$item && $action eq 'lookup' ){
|
|
$template->param( ERROR_ITEM_NOT_FOUND => 1 );
|
|
$template->param( UNKNOWN_BARCODE => $barcode ) if $barcode;
|
|
}
|
|
|
|
$template->param( course => GetCourse($course_id) );
|
|
|
|
if ( $action eq 'lookup' and $item ) {
|
|
my $course_item = Koha::Course::Items->find({ itemnumber => $item->id });
|
|
my $course_reserve =
|
|
($course_item)
|
|
? GetCourseReserve(
|
|
course_id => $course_id,
|
|
ci_id => $course_item->ci_id,
|
|
)
|
|
: undef;
|
|
|
|
my $itemtypes = Koha::ItemTypes->search;
|
|
$template->param(
|
|
item => $item,
|
|
biblio => $item->biblio,
|
|
course_item => $course_item,
|
|
course_reserve => $course_reserve,
|
|
is_edit => $is_edit,
|
|
|
|
ccodes => GetAuthorisedValues('CCODE'),
|
|
locations => GetAuthorisedValues('LOC'),
|
|
itypes => $itemtypes, # FIXME We certainly want to display the translated_description in the template
|
|
return => $return,
|
|
);
|
|
|
|
} elsif ( $action eq 'add' ) {
|
|
my $itype = scalar $cgi->param('itype');
|
|
my $ccode = scalar $cgi->param('ccode');
|
|
my $holdingbranch = scalar $cgi->param('holdingbranch');
|
|
my $location = scalar $cgi->param('location');
|
|
|
|
my $itype_enabled = scalar $cgi->param('itype_enabled') ? 1 : 0;
|
|
my $ccode_enabled = scalar $cgi->param('ccode_enabled') ? 1 : 0;
|
|
my $holdingbranch_enabled = scalar $cgi->param('holdingbranch_enabled') ? 1 : 0;
|
|
my $location_enabled = scalar $cgi->param('location_enabled') ? 1 : 0;
|
|
|
|
my $ci_id = ModCourseItem(
|
|
itemnumber => $itemnumber,
|
|
itype => $itype,
|
|
ccode => $ccode,
|
|
holdingbranch => $holdingbranch,
|
|
location => $location,
|
|
itype_enabled => $itype_enabled,
|
|
ccode_enabled => $ccode_enabled,
|
|
holdingbranch_enabled => $holdingbranch_enabled,
|
|
location_enabled => $location_enabled,
|
|
);
|
|
|
|
my $cr_id = ModCourseReserve(
|
|
course_id => $course_id,
|
|
ci_id => $ci_id,
|
|
staff_note => scalar $cgi->param('staff_note'),
|
|
public_note => scalar $cgi->param('public_note'),
|
|
);
|
|
|
|
if ( $return ) {
|
|
print $cgi->redirect("/cgi-bin/koha/course_reserves/course-details.pl?course_id=$return");
|
|
exit;
|
|
}
|
|
}
|
|
|
|
output_html_with_http_headers $cgi, $cookie, $template->output;
|