Attachment 109537 Details for Bug 25541 – Bug 25541: (QA follow-up) Defualt to disabled + Correct message

[patch] Bug 25541: (QA follow-up) Defualt to disabled + Correct message

Bug-25541-QA-follow-up-Defualt-to-disabled--Correc.patch (text/plain), 2.99 KB, created by Martin Renvoize (ashimema) on 2020-09-02 13:42:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-09-02 13:42:29 UTC

Size: 2.99 KB

patch

obsolete

>From 50991a80df213fb920f5ca38c2581e1ea9eff16d Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 2 Sep 2020 14:40:08 +0100
>Subject: [PATCH] Bug 25541: (QA follow-up) Defualt to disabled + Correct
> message
>
>This patch defaults the 'holds_block_checkin' configuration to disabled
>(to maintain current behaviour on upgrades). It also updates a
>copy/paste for siplog logging to make the message triggered by this
>action unique as expected.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/SIP/ILS.pm                  | 2 +-
> debian/templates/SIPconfig.xml | 2 +-
> etc/SIPconfig.xml              | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/C4/SIP/ILS.pm b/C4/SIP/ILS.pm
>index 54f9c2839c..d2a253873b 100644
>--- a/C4/SIP/ILS.pm
>+++ b/C4/SIP/ILS.pm
>@@ -227,7 +227,7 @@ sub checkin {
>         siplog( "LOG_WARNING", "Problem with issue_id in issues and old_issues; check the about page" );
>     } elsif ( $data->{messages}->{ResFound} && !$circ->ok && $holds_block_checkin ) {
>         $circ->screen_msg("Item is on hold, please return to circulation desk");
>-        siplog ("LOG_DEBUG", "C4::SIP::ILS::Checkin - item withdrawn");
>+        siplog ("LOG_DEBUG", "C4::SIP::ILS::Checkin - item on hold");
>     } elsif ( $data->{messages}->{withdrawn} && !$circ->ok && C4::Context->preference("BlockReturnOfWithdrawnItems") ) {
>             $circ->screen_msg("Item withdrawn, return not allowed");
>             siplog ("LOG_DEBUG", "C4::SIP::ILS::Checkin - item withdrawn");
>diff --git a/debian/templates/SIPconfig.xml b/debian/templates/SIPconfig.xml
>index 9d48351b18..dd77cb230c 100644
>--- a/debian/templates/SIPconfig.xml
>+++ b/debian/templates/SIPconfig.xml
>@@ -51,7 +51,7 @@
>       <login id="lpl-sc-beacock" password="xyzzy"
>              delimiter="|" error-detect="enabled" institution="LPL"
>              send_patron_home_library_in_af="1"
>-             holds_block_checkin="1"
>+             holds_block_checkin="0"
>              av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]" >
>           <screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" />
>           <screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" />
>diff --git a/etc/SIPconfig.xml b/etc/SIPconfig.xml
>index 44bfd7a140..e61289f2de 100644
>--- a/etc/SIPconfig.xml
>+++ b/etc/SIPconfig.xml
>@@ -60,7 +60,7 @@
>              av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]"
>              hide_fields="BD,BE,BF,PB"
>              register_id=''
>-             holds_block_checkin="1">
>+             holds_block_checkin="0">
>           <screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" />
>           <screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" />
>           <patron_attribute field="XY" code="CODE" />
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 25541: 105090 | 105098 | 107791 | 108626 | 109519 | 109534 | 109535 | 109536 | 109537