Bug 34478: Manual fix - Add items (course reserves)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
parent
b85d77284a
commit
477a554151
3 changed files with 9 additions and 10 deletions
|
@ -26,7 +26,6 @@ use C4::Auth qw( get_template_and_user );
|
||||||
use C4::Circulation qw( barcodedecode );
|
use C4::Circulation qw( barcodedecode );
|
||||||
use C4::Output qw( output_html_with_http_headers );
|
use C4::Output qw( output_html_with_http_headers );
|
||||||
use C4::Koha qw( GetAuthorisedValues );
|
use C4::Koha qw( GetAuthorisedValues );
|
||||||
use Koha::Items;
|
|
||||||
|
|
||||||
use C4::CourseReserves qw( GetCourse GetCourseReserve ModCourse ModCourseItem ModCourseReserve );
|
use C4::CourseReserves qw( GetCourse GetCourseReserve ModCourse ModCourseItem ModCourseReserve );
|
||||||
|
|
||||||
|
@ -35,7 +34,7 @@ use Koha::ItemTypes;
|
||||||
|
|
||||||
my $cgi = CGI->new;
|
my $cgi = CGI->new;
|
||||||
|
|
||||||
my $action = $cgi->param('action') || '';
|
my $op = $cgi->param('op') || '';
|
||||||
my $course_id = $cgi->param('course_id') || '';
|
my $course_id = $cgi->param('course_id') || '';
|
||||||
my $barcode = $cgi->param('barcode') || '';
|
my $barcode = $cgi->param('barcode') || '';
|
||||||
my $return = $cgi->param('return') || '';
|
my $return = $cgi->param('return') || '';
|
||||||
|
@ -60,7 +59,7 @@ if ( $barcode || $itemnumber ) {
|
||||||
$biblio = Koha::Biblios->find( $biblionumber );
|
$biblio = Koha::Biblios->find( $biblionumber );
|
||||||
}
|
}
|
||||||
|
|
||||||
my $step = ( $action eq 'lookup' && ( $item or $biblio ) ) ? '2' : '1';
|
my $step = ( $op eq 'lookup' && ( $item or $biblio ) ) ? '2' : '1';
|
||||||
|
|
||||||
my $tmpl = ($course_id) ? "add_items-step$step.tt" : "invalid-course.tt";
|
my $tmpl = ($course_id) ? "add_items-step$step.tt" : "invalid-course.tt";
|
||||||
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
||||||
|
@ -71,7 +70,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
if ( !$item && !$biblio && $action eq 'lookup' ){
|
if ( !$item && !$biblio && $op eq 'lookup' ){
|
||||||
$template->param( ERROR_ITEM_NOT_FOUND => 1 );
|
$template->param( ERROR_ITEM_NOT_FOUND => 1 );
|
||||||
$template->param( UNKNOWN_BARCODE => $barcode ) if $barcode;
|
$template->param( UNKNOWN_BARCODE => $barcode ) if $barcode;
|
||||||
$template->param( UNKNOWN_BIBLIONUMBER => $biblionumber ) if $biblionumber;
|
$template->param( UNKNOWN_BIBLIONUMBER => $biblionumber ) if $biblionumber;
|
||||||
|
@ -79,7 +78,7 @@ if ( !$item && !$biblio && $action eq 'lookup' ){
|
||||||
|
|
||||||
$template->param( course => GetCourse($course_id) );
|
$template->param( course => GetCourse($course_id) );
|
||||||
|
|
||||||
if ( $action eq 'lookup' and $item ) {
|
if ( $op eq 'lookup' and $item ) {
|
||||||
my $course_item = Koha::Course::Items->find({ itemnumber => $item->id });
|
my $course_item = Koha::Course::Items->find({ itemnumber => $item->id });
|
||||||
my $course_reserve =
|
my $course_reserve =
|
||||||
($course_item)
|
($course_item)
|
||||||
|
@ -103,7 +102,7 @@ if ( $action eq 'lookup' and $item ) {
|
||||||
return => $return,
|
return => $return,
|
||||||
);
|
);
|
||||||
|
|
||||||
} elsif ( $action eq 'lookup' and $biblio ) {
|
} elsif ( $op eq 'lookup' and $biblio ) {
|
||||||
my $course_item = Koha::Course::Items->find({ biblionumber => $biblio->biblionumber });
|
my $course_item = Koha::Course::Items->find({ biblionumber => $biblio->biblionumber });
|
||||||
my $course_reserve =
|
my $course_reserve =
|
||||||
($course_item)
|
($course_item)
|
||||||
|
@ -123,7 +122,7 @@ if ( $action eq 'lookup' and $item ) {
|
||||||
return => $return,
|
return => $return,
|
||||||
);
|
);
|
||||||
|
|
||||||
} elsif ( $action eq 'cud-add' ) {
|
} elsif ( $op eq 'cud-add' ) {
|
||||||
my $itype = scalar $cgi->param('itype');
|
my $itype = scalar $cgi->param('itype');
|
||||||
my $ccode = scalar $cgi->param('ccode');
|
my $ccode = scalar $cgi->param('ccode');
|
||||||
my $homebranch = $cgi->param('homebranch');
|
my $homebranch = $cgi->param('homebranch');
|
||||||
|
|
|
@ -46,10 +46,10 @@
|
||||||
[% END %]
|
[% END %]
|
||||||
[% END %]
|
[% END %]
|
||||||
|
|
||||||
<form method="post" action="/cgi-bin/koha/course_reserves/add_items.pl">
|
<form method="get" action="/cgi-bin/koha/course_reserves/add_items.pl">
|
||||||
[% INCLUDE 'csrf-token.inc' %]
|
[% INCLUDE 'csrf-token.inc' %]
|
||||||
<input type="hidden" name="course_id" value="[% course.course_id | html %]" />
|
<input type="hidden" name="course_id" value="[% course.course_id | html %]" />
|
||||||
<input type="hidden" name="action" value="lookup" />
|
<input type="hidden" name="op" value="lookup" />
|
||||||
|
|
||||||
<fieldset class="rows">
|
<fieldset class="rows">
|
||||||
<legend>Add items: scan barcode</legend>
|
<legend>Add items: scan barcode</legend>
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
[% INCLUDE 'csrf-token.inc' %]
|
[% INCLUDE 'csrf-token.inc' %]
|
||||||
<input type="hidden" name="course_id" value="[% course.course_id | html %]" />
|
<input type="hidden" name="course_id" value="[% course.course_id | html %]" />
|
||||||
<input type="hidden" name="return" value="[% return | html %]" />
|
<input type="hidden" name="return" value="[% return | html %]" />
|
||||||
<input type="hidden" name="action" value="add" />
|
<input type="hidden" name="op" value="cud-add" />
|
||||||
|
|
||||||
[% IF item # adding an item to course items %]
|
[% IF item # adding an item to course items %]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue