From 82b1fa2284049138697d4a156a15c4f111b8945b Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 24 Aug 2015 13:50:08 +0200 Subject: [PATCH] Bug 9809: [QA Follow-up] Still found some remains Content-Type: text/plain; charset=utf-8 In the staff client we had still some remains referring to the constraint types. Also touched one comment line from SIP. Test plan: Add a hold in the staff client. --- C4/SIP/ILS/Item.pm | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 6 ------ reserve/request.pl | 2 -- 3 files changed, 9 deletions(-) diff --git a/C4/SIP/ILS/Item.pm b/C4/SIP/ILS/Item.pm index 0f5f816..4586fee 100644 --- a/C4/SIP/ILS/Item.pm +++ b/C4/SIP/ILS/Item.pm @@ -47,7 +47,6 @@ our $VERSION = 3.07.00.049; itemnumber => '823', priority => '1', reservenotes => undef, - constrainttype => 'a', reservedate => '2008-10-09', found => undef, rtimestamp => '2008-10-09 11:15:06', diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 80be359..a6a8f91 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -769,7 +769,6 @@ function checkMultiHold() { [% END %] [% ELSE %] - [% IF ( reserveloo.constrainttypea ) %] [% IF ( reserveloo.item_level_hold ) %] Only item @@ -785,11 +784,6 @@ function checkMultiHold() { Next available [% END %] - [% ELSE %] - [% IF ( reserveloo.constrainttypeo ) %] - only this type :[% reserveloo.volumeddesc %] [% reserveloo.itemtype %] - [% END %] - [% END %] [% END %] diff --git a/reserve/request.pl b/reserve/request.pl index 62f82a8..06dc6bf 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -526,8 +526,6 @@ foreach my $biblionumber (@biblionumbers) { $reserve{'notes'} = $res->{'reservenotes'}; $reserve{'wait'} = ( ( defined $res->{'found'} and $res->{'found'} eq 'W' ) or ( $res->{'priority'} eq '0' ) ); - $reserve{'constrainttypea'} = ( $res->{'constrainttype'} eq 'a' ); - $reserve{'constrainttypeo'} = ( $res->{'constrainttype'} eq 'o' ); $reserve{'voldesc'} = $res->{'volumeddesc'}; $reserve{'ccode'} = $res->{'ccode'}; $reserve{'barcode'} = $res->{'barcode'}; -- 1.7.10.4