Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 34478: Add 'op' to circ/branchtransfers

Browse source 
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2024-02-08 12:06:55 +01:00
parent 93e51a1103
commit 0fdcd75b9f
Signed by: jonathan.druart
GPG key ID: A085E712BEF0E0F0
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
circ/branchtransfers.pl
View file

@ -76,7 +76,7 @@ my $reqmessage;
my $cancelled;
my $settransit;
my $request = $query->param('cud-request') || '';
my $op = $query->param('op') || '';
my $borrowernumber = $query->param('borrowernumber') || 0;
my $tobranchcd = $query->param('tobranchcd') || '';
my $trigger = 'Manual';
@ -84,7 +84,7 @@ my $trigger = 'Manual';
my $ignoreRs = 0;
############
# Deal with the requests....
if ( $request eq "KillWaiting" ) {
if ( $op eq "cud-KillWaiting" ) {
my $item = $query->param('itemnumber');
my $holds = Koha::Holds->search({
itemnumber => $item,
@ -96,7 +96,7 @@ if ( $request eq "KillWaiting" ) {
$reqmessage = 1;
} # FIXME else?
}
elsif ( $request eq "SetTransit" ) {
elsif ( $op eq "cud-SetTransit" ) {
my $item = $query->param('itemnumber');
my $reserve_id = $query->param('reserve_id');
ModReserveAffect( $item, $borrowernumber, 1, $reserve_id );
@ -105,7 +105,7 @@ elsif ( $request eq "SetTransit" ) {
$reqmessage = 1;
$trigger = 'Reserve';
}
elsif ( $request eq 'KillReserved' ) {
elsif ( $op eq 'cud-KillReserved' ) {
my $biblionumber = $query->param('biblionumber');
my $reserve_id = $query->param('reserve_id');
my $hold = Koha::Holds->find({ reserve_id => $reserve_id });
@ -122,8 +122,7 @@ my $transferred;
my $barcode = $query->param('barcode');
# remove leading/trailing whitespace
$barcode = barcodedecode($barcode) if $barcode;
# warn "barcode : $barcode";
if ($barcode) {
if ($op eq 'cud-transfer' && $barcode) {
( $transferred, $messages ) =
transferbook({

10
koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
View file

@ -77,11 +77,11 @@
<input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
<input type="hidden" name="barcode" value="[% barcode | html %]" />
[% IF ( waiting or transferred or processing ) %]
<input type="hidden" name="request" value="KillWaiting" />
<input type="hidden" name="op" value="cud-KillWaiting" />
<input type="submit" class="btn btn-primary" value="Cancel" />
[% END %]
[% IF ( reserved ) %]
<input type="hidden" name="request" value="SetTransit" />
<input type="hidden" name="op" value="cud-SetTransit" />
<input type="submit" class="btn btn-primary" value="Transfer" />
[% END %]
</form>
@ -103,7 +103,7 @@
<input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
<input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
<input type="hidden" name="barcode" value="[% barcode | html %]">
<input type="hidden" name="request" value="KillReserved" />
<input type="hidden" name="op" value="cud-KillReserved" />
<input type="submit" class="btn btn-primary" value="Cancel" />
</form>
</td>
@ -112,8 +112,7 @@
<tr>
<th>Ignore and return to transfers: </th>
<td>
<form method="post" name="mainform" id="mainform" action="branchtransfers.pl">
[% INCLUDE 'csrf-token.inc' %]
<form method="get" name="mainform" id="mainform" action="branchtransfers.pl">
<input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
<input type="hidden" name="barcode" />
[% FOREACH trsfitemloo IN trsfitemloop %]
@ -200,6 +199,7 @@
<input type="hidden" name="fb-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.frombrcd | html %]" />
<input type="hidden" name="tb-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.tobrcd | html %]" />
[% END %]
<input type="hidden" name="op" value="cud-transfer" />
</form>
</div>