Attachment 42048 Details for Bug 14655 – [Signed-off] Bug 14655: Add a warning if the checkin will fail

[patch] [Signed-off] Bug 14655: Add a warning if the checkin will fail

Signed-off-Bug-14655-Add-a-warning-if-the-checkin-.patch (text/plain), 3.73 KB, created by Marc Véron on 2015-08-28 08:08:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-08-28 08:08:06 UTC

Size: 3.73 KB

patch

obsolete

>From 8d6e719f33d6038720580de548b29da0928470b1 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 18 Aug 2015 18:10:37 +0100
>Subject: [PATCH] [Signed-off] Bug 14655: Add a warning if the checkin will
> fail
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>On the checkin and checkout page, the checkin will fail if the patron
>has requested the privacy and the AnonymousPatron is not correctly set.
>
>This patch adds a warning message on both pages.
>
>Test plan:
>0/ Be sure you don't have any patron with privacy=2 (Never)
>1/ Set OPACPrivacy, not AnonymousPatron
>2/ Go on the checkin, you should a warning (same as before this patch).
>3/ Set the privacy=2 for a patron
>4/ Go on the circulation page, a warning should appear (for this
>specific patron)
>5/ Check an item out to this patron
>6/ Check the item in on the checkin page.
>The item is not checked in and you get a specific message for this
>patron.
>
>Confirm other/correct situations don't trigger the messages.
>
>Followed test plan. Works as expected.
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>---
> circ/returns.pl                                             |    1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt |    5 +++++
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt     |    9 +++++----
> 3 files changed, 11 insertions(+), 4 deletions(-)
>
>diff --git a/circ/returns.pl b/circ/returns.pl
>index 4a13711..ec0679f 100755
>--- a/circ/returns.pl
>+++ b/circ/returns.pl
>@@ -351,6 +351,7 @@ if ($barcode) {
>         $riduedate{0}     = 0;
>         push( @inputloop, \%input );
>     }
>+    $template->param( privacy => $borrower->{privacy} );
> }
> $template->param( inputloop => \@inputloop );
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index fd4c53c..05b819d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -584,6 +584,11 @@ No patron matched <span class="ex">[% message %]</span>
> 
> [% IF ( borrowernumber ) %]
> <div class="yui-g">
>+
>+[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
>+    <div class="dialog alert"><strong>Error:</strong> This patron has requested a privacy on returning item but the AnonymousPatron pref is not set correctly.</div>
>+[% END %]
>+
> [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
> [% IF ( flagged ) %]
> <div class="yui-u first">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>index 769e4c0..40a3663 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -117,10 +117,11 @@ $(document).ready(function () {
> 	<div id="yui-main">
> 
> <div class="yui-g">
>-[% IF !Koha.Preference('AnonymousPatron') %]
>-    [% IF Koha.Preference('OPACPrivacy') %]
>-        <div class="dialog alert"><strong>Error:</strong> The system preference OPACPrivacy is set but AnonymousPatron is not! Please correct this before continuing circulation.</div>
>-    [% END %]
>+
>+[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
>+    <div class="dialog alert"><strong>Error:</strong> This patron has requested a privacy on returning item but the AnonymousPatron pref is not set correctly.</div>
>+[% ELSIF NOT Koha.Preference('AnonymousPatron') AND Koha.Preference('OPACPrivacy') %]
>+    <div class="dialog alert"><strong>Error:</strong> The system preference OPACPrivacy is set but AnonymousPatron is not! Please correct this before continuing circulation.</div>
> [% END %]
> 
> [% IF additional_materials %]
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 14655: 41630 | 41631 | 42048 | 42049 | 42517 | 42540 | 42541 | 42542