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

Bug 34478: Move compatibility code

Browse source 
All ILL backend retrocompatibility code has been moved to Illrequest.pm:get_op_param_deprecation for isolation and clarity

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Pedro Amorim 2024-02-06 09:25:45 -01:00 committed by Jonathan Druart
parent a9adee54b8
commit 93e3fed043
Signed by: jonathan.druart
GPG key ID: A085E712BEF0E0F0
3 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Koha/Illrequest.pm
View file

@ -2003,16 +2003,34 @@ sub strings_map {
return $strings;
}
=head3 check_url_param_deprecation
Koha::Illrequest->check_url_param_deprecation($params);
=head3 get_op_param_deprecation
Check URL params and issue a deprecation message if any deprecated parameters are found
my $op = Koha::Illrequest->check_url_param_deprecation($params);
Issues a deprecation message for the given parameters, if needed.
Returns the appropriate operation based on the interface type.
=over
=item interface
The interface this is running on: 'opac' or 'intranet'
=back
=over
=item params
CGI parameters
=back
=cut
sub check_url_param_deprecation {
my ( $self, $params ) = @_;
sub get_op_param_deprecation {
my ( $self, $interface, $params ) = @_;
my $deprecation_message;
@ -2028,6 +2046,18 @@ sub check_url_param_deprecation {
if $params->{'backend'} && $deprecation_message;
deprecated $deprecation_message if $deprecation_message;
my $op;
if ( $interface eq 'opac' ) {
$op = $params->{'op'} // $params->{'method'} // 'list';
$op = 'cud-create' if $op eq 'create' || $op eq 'add_form';
} elsif ( $interface eq 'intranet' ) {
$op = $params->{op} // $params->{method} // 'illlist';
$op = 'cud-create' if $op eq 'create';
$op = 'cud-cancel' if $op eq 'cancel';
$op = 'cud-delete' if $op eq 'delete';
}
return $op;
}
=head3 _type

7
ill/ill-requests.pl
View file

@ -52,12 +52,7 @@ unless ( C4::Context->preference('ILLModule') ) {
exit;
}
Koha::Illrequest->check_url_param_deprecation($params);
my $op = $params->{op} // $params->{method} // 'illlist';
$op = 'cud-create' if $op eq 'create';
$op = 'cud-cancel' if $op eq 'cancel';
$op = 'cud-delete' if $op eq 'delete';
my $op = Koha::Illrequest->get_op_param_deprecation( 'intranet', $params );
my ( $template, $patronnumber, $cookie ) = get_template_and_user( {
template_name => 'ill/ill-requests.tt',

5
opac/opac-illrequests.pl
View file

@ -61,10 +61,7 @@ my $backends_available = ( scalar @{$backends} > 0 );
$template->param( backends_available => $backends_available );
my $patron = Koha::Patrons->find($loggedinuser);
Koha::Illrequest->check_url_param_deprecation($params);
my $op = $params->{'op'} // $params->{'method'} // 'list';
$op = 'cud-create' if $op eq 'create' || $op eq 'add_form';
my $op = Koha::Illrequest->get_op_param_deprecation( 'opac', $params );
my ( $illrequest_id, $request );
if ( $illrequest_id = $params->{illrequest_id} ) {