From 12db2ade4c58be0d8f6475f17241a7166fef2289 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 18 May 2021 17:49:28 -0300 Subject: [PATCH] Bug 28377: (follow-up) Remove svc/hold/{resume|suspend} This files are no longer used and thus removed. Their functionality is already present on the API POST /holds/:hold_id/suspension DELETE /holds/:hold_id/suspension To test: 1. Apply this patch 2. Run: $ git grep 'hold/suspend' $ git grep 'hold/resume' => SUCCESS: No references to the scripts 3. Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: David Nind Signed-off-by: Martin Renvoize --- svc/hold/resume | 54 ---------------------------------------- svc/hold/suspend | 64 ------------------------------------------------ 2 files changed, 118 deletions(-) delete mode 100755 svc/hold/resume delete mode 100755 svc/hold/suspend diff --git a/svc/hold/resume b/svc/hold/resume deleted file mode 100755 index 4c01c0ee7c..0000000000 --- a/svc/hold/resume +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/perl - -# Copyright 2015 ByWater Solutions -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Koha is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . - -use Modern::Perl; - -use CGI; -use JSON qw(to_json); - -use C4::Context; -use C4::Output qw(output_with_http_headers); -use C4::Auth qw(check_cookie_auth); -use Koha::DateUtils qw(dt_from_string); -use Koha::Holds; - -my $input = CGI->new; - -my ( $auth_status ) = - check_cookie_auth( $input->cookie('CGISESSID'), { circulate => 'circulate_remaining_permissions' } ); - -if ( $auth_status ne "ok" ) { - print $input->header(-type => 'text/plain', -status => '403 Forbidden'); - exit 0; -} - -my $reserve_id = $input->param('reserve_id'); - -my $hold = Koha::Holds->find( $reserve_id ); - -unless ( $hold ) { - my $json = to_json( { success => 0, error => "HOLD_NOT_FOUND" } ); - output_with_http_headers( $input, undef, $json, "json" ); - exit; -} - -$hold->resume(); - -my $json = to_json( { success => !$hold->suspend() } ); -output_with_http_headers( $input, undef, $json, "json" ); diff --git a/svc/hold/suspend b/svc/hold/suspend deleted file mode 100755 index 01ec1d26f8..0000000000 --- a/svc/hold/suspend +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/perl - -# Copyright 2015 ByWater Solutions -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Koha is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . - -use Modern::Perl; - -use CGI; -use JSON qw(to_json); - -use C4::Context; -use C4::Output qw(output_with_http_headers); -use C4::Auth qw(check_cookie_auth); -use Koha::DateUtils qw(dt_from_string); -use Koha::Holds; - -my $input = CGI->new; - -my ( $auth_status ) = - check_cookie_auth( $input->cookie('CGISESSID'), { circulate => 'circulate_remaining_permissions' } ); - -if ( $auth_status ne "ok" ) { - print $input->header(-type => 'text/plain', -status => '403 Forbidden'); - exit 0; -} - -my $reserve_id = $input->param('reserve_id'); - -my $suspend_until = $input->param('suspend_until') || undef; -if ($suspend_until) { - eval { $suspend_until = dt_from_string($suspend_until) }; - - if ($@) { - my $json = to_json( { success => 0, error => 'INVALID_DATE' } ); - output_with_http_headers( $input, undef, $json, "json" ); - exit; - } -} - -my $hold = Koha::Holds->find($reserve_id); -unless ($hold) { - my $json = to_json( { success => 0, error => 'HOLD_NOT_FOUND' } ); - output_with_http_headers( $input, undef, $json, "json" ); - exit; -} - -$hold->suspend_hold($suspend_until); - -my $json = to_json( { success => $hold->suspend() } ); -output_with_http_headers( $input, undef, $json, "json" ); -- 2.20.1