From 188202cef95f8d8ccd986b4632386b5c37676933 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Tue, 21 Jan 2020 16:17:47 +0000 Subject: [PATCH] Bug 24471: handle_commit_maybe => redirect_user This patch renames all occurrences of handle_commit_maybe to redirect_user Test plan: - Navigate around ILL and check redirections from one action/stage to another are happening correctly --- Koha/Illbackends/BLDSS | 1 + Koha/Illbackends/FreeForm | 1 + Koha/Illbackends/Koha | 1 + ill/ill-requests.pl | 18 +++++++++--------- 4 files changed, 12 insertions(+), 9 deletions(-) create mode 120000 Koha/Illbackends/BLDSS create mode 120000 Koha/Illbackends/FreeForm create mode 120000 Koha/Illbackends/Koha diff --git a/Koha/Illbackends/BLDSS b/Koha/Illbackends/BLDSS new file mode 120000 index 0000000000..95e9e7ea7f --- /dev/null +++ b/Koha/Illbackends/BLDSS @@ -0,0 +1 @@ +/home/koha-koha/illbackends/BLDSS \ No newline at end of file diff --git a/Koha/Illbackends/FreeForm b/Koha/Illbackends/FreeForm new file mode 120000 index 0000000000..05911ec0ff --- /dev/null +++ b/Koha/Illbackends/FreeForm @@ -0,0 +1 @@ +/home/koha-koha/illbackends/FreeForm \ No newline at end of file diff --git a/Koha/Illbackends/Koha b/Koha/Illbackends/Koha new file mode 120000 index 0000000000..82c028960c --- /dev/null +++ b/Koha/Illbackends/Koha @@ -0,0 +1 @@ +/home/koha-koha/illbackends/Koha \ No newline at end of file diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl index 010c61e618..1dc0f18e66 100755 --- a/ill/ill-requests.pl +++ b/ill/ill-requests.pl @@ -86,7 +86,7 @@ if ( $backends_available ) { whole => $backend_result, request => $request ); - handle_commit_maybe($backend_result, $request); + redirect_user($backend_result, $request); } elsif ( $op eq 'migrate' ) { # We're in the process of migrating a request @@ -118,7 +118,7 @@ if ( $backends_available ) { request => $request ); } - handle_commit_maybe( $backend_result, $request ); + redirect_user( $backend_result, $request ); } elsif ( $op eq 'confirm' ) { # Backend 'confirm' method @@ -131,7 +131,7 @@ if ( $backends_available ) { ); # handle special commit rules & update type - handle_commit_maybe($backend_result, $request); + redirect_user($backend_result, $request); } elsif ( $op eq 'cancel' ) { # Backend 'cancel' method @@ -144,7 +144,7 @@ if ( $backends_available ) { ); # handle special commit rules & update type - handle_commit_maybe($backend_result, $request); + redirect_user($backend_result, $request); } elsif ( $op eq 'edit_action' ) { # Handle edits to the Illrequest object. @@ -189,7 +189,7 @@ if ( $backends_available ) { next => 'illlist', value => {} }; - handle_commit_maybe($backend_result, $request); + redirect_user($backend_result, $request); } } elsif ( $op eq 'moderate_action' ) { @@ -230,7 +230,7 @@ if ( $backends_available ) { ); # handle special commit rules & update type - handle_commit_maybe($backend_result, $request); + redirect_user($backend_result, $request); } elsif ( $op eq 'generic_confirm' ) { my $backend_result; @@ -266,7 +266,7 @@ if ( $backends_available ) { }; # handle special commit rules & update type - handle_commit_maybe($backend_result, $request); + redirect_user($backend_result, $request); } elsif ( $op eq 'illlist') { # If we receive a pre-filter, make it available to the template @@ -315,7 +315,7 @@ if ( $backends_available ) { ); # handle special commit rules & update type - handle_commit_maybe($backend_result, $request); + redirect_user($backend_result, $request); } } @@ -328,7 +328,7 @@ $template->param( output_html_with_http_headers( $cgi, $cookie, $template->output ); -sub handle_commit_maybe { +sub redirect_user { my ( $backend_result, $request ) = @_; # We need to special case 'commit' -- 2.11.0