Bugzilla – Attachment 54712 Details for
Bug 8030
Change pickup location of a hold from patron record
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8030 - (QA followup) Remove svc file no longer user Use animated gif for waiting as elsewhere Remove confirmation
Bug-8030---QA-followup-Remove-svc-file-no-longer-u.patch (text/plain), 6.99 KB, created by
Nick Clemens (kidclamp)
on 2016-08-22 15:45:11 UTC
(
hide
)
Description:
Bug 8030 - (QA followup) Remove svc file no longer user Use animated gif for waiting as elsewhere Remove confirmation
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2016-08-22 15:45:11 UTC
Size:
6.99 KB
patch
obsolete
>From a9ce486c72305a469a5f897380f070e7d2cdc2df Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Mon, 22 Aug 2016 15:43:57 +0000 >Subject: [PATCH] Bug 8030 - (QA followup) Remove svc file no longer user > Use animated gif for waiting as elsewhere Remove confirmation > >--- > .../intranet-tmpl/prog/en/includes/strings.inc | 1 + > koha-tmpl/intranet-tmpl/prog/js/holds.js | 42 +++++++------- > svc/hold/update_location | 65 ---------------------- > 3 files changed, 20 insertions(+), 88 deletions(-) > delete mode 100755 svc/hold/update_location > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc >index 368b783..8289900 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc >@@ -39,5 +39,6 @@ > var SUSPEND_HOLD_ERROR_DATE = _("Unable to suspend hold, invalid date"); > var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found"); > var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found"); >+ var CURRENT = _(" (current) "); > //]]> > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js >index 14ca154..b95cac0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js >@@ -107,7 +107,7 @@ $(document).ready(function() { > var setbranch; > if( oObj.branches[i].selected ){ > selectedbranch = " selected='selected' "; >- setbranch = " (set) "; >+ setbranch = CURRENT; > } > else{ > selectedbranch = ''; >@@ -196,28 +196,24 @@ $(document).ready(function() { > }); > > $(".hold_location_select").change(function(){ >- if( confirm( _("Do you want to change the pickup location?") ) ){ >- $(this).prop("disabled",true); >- var cur_select = $(this); >- $(this).after('<i id="holdwaiter" class="fa fa-circle-o-notch fa-spin fa-lg fa-fw"></i>'); >- var api_url = '/api/v1/holds/'+$(this).attr('reserve_id'); >- var update_info = JSON.stringify({ branchcode: $(this).val(), priority: parseInt($(this).attr("priority"),10) }); >- $.ajax({ >- method: "PUT", >- url: api_url, >- data: update_info , >- success: function( data ){ holdsTable.api().ajax.reload(); }, >- error: function( jqXHR, textStatus, errorThrown) { >- alert('There was an error:'+textStatus+" "+errorThrown); >- cur_select.prop("disabled",false); >- $("#holdwaiter").remove(); >- cur_select.val( cur_select.children('option[selected="selected"]').val() ); >- }, >- }); >- } >- else{ >- $(this).val( $(this).children('option[selected="selected"]').val() ); >- } >+ $(this).prop("disabled",true); >+ var cur_select = $(this); >+ var res_id = $(this).attr('reserve_id'); >+ $(this).after('<div id="updating_reserveno'+res_id+'" class="waiting"><img src="/intranet-tmpl/prog/img/loading-small.gif" alt="" /><span class="waiting_msg"></span></div>'); >+ var api_url = '/api/v1/holds/'+res_id; >+ var update_info = JSON.stringify({ branchcode: $(this).val(), priority: parseInt($(this).attr("priority"),10) }); >+ $.ajax({ >+ method: "PUT", >+ url: api_url, >+ data: update_info , >+ success: function( data ){ holdsTable.api().ajax.reload(); }, >+ error: function( jqXHR, textStatus, errorThrown) { >+ alert('There was an error:'+textStatus+" "+errorThrown); >+ cur_select.prop("disabled",false); >+ $("#updating_reserveno"+res_id).remove(); >+ cur_select.val( cur_select.children('option[selected="selected"]').val() ); >+ }, >+ }); > }); > > }); >diff --git a/svc/hold/update_location b/svc/hold/update_location >deleted file mode 100755 >index 7abb766..0000000 >--- a/svc/hold/update_location >+++ /dev/null >@@ -1,65 +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, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >- >-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 C4::Reserves qw(ModReserve); >-use Koha::DateUtils qw(dt_from_string); >-use Koha::Holds; >- >-my $input = new CGI; >- >-my ( $auth_status, $sessionID ) = >- 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 $updated_branch = $input->param('updated_branch'); >- >-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; >-} >- >-ModReserve( { >- rank => $hold->priority, >- reserve_id => $hold->reserve_id, >- branchcode => $updated_branch, >- itemnumber => $hold->itemnumber, >- borrowernumber => $hold->borrowernumber, >- biblionumber => $hold->biblionumber >- }); >- >-$hold = Koha::Holds->find( $reserve_id ); >- >-my $json = to_json( { success => ( $hold->branchcode eq $updated_branch ) } ); >-output_with_http_headers( $input, undef, $json, "json" ); >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8030
:
53046
|
53047
|
53508
|
54659
|
54712
|
55200
|
55201
|
55202
|
55448