Bugzilla – Attachment 54425 Details for
Bug 17101
Confirm a question before check in
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17101 - Style Up fix
-Bug-17101---Confirm-a-question-before-check-in.patch (text/plain), 2.91 KB, created by
Tobias Reimann
on 2016-08-14 08:56:17 UTC
(
hide
)
Description:
Bug 17101 - Style Up fix
Filename:
MIME Type:
Creator:
Tobias Reimann
Created:
2016-08-14 08:56:17 UTC
Size:
2.91 KB
patch
obsolete
>From 36da7671cadde75a17608e231d1796304a90d1c7 Mon Sep 17 00:00:00 2001 >From: Tobias Reimann <T.Reimann95@gmx.de> >Date: Fri, 12 Aug 2016 10:27:28 -0700 >Subject: [PATCH] Bug 17101 - Confirm a question before check in >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > > This patch enable a message for the user after he hit no, by the >question in the check in window. Fixed the bug that no other message are displayed > > (new) Test plan: > > 1. Create an itemtype, with the checkinmsgtype question > 2. Create an item with the itemtype from 1 > 3. Check out the item from 2 > 4. Check in the item from 3 > 5. Click no ==> item shouldn't be check in and a message should be displ >ayed > 6. Check in the item from 3 > 7. Click yes ==> item should be check in >ed > > Optional: > Before step 4 check others item in, to check if the prevouis check in's > Sponsored-by: Bücherei Maichingen >--- > circ/returns.pl | 7 ++++++- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +++++- > 2 files changed, 11 insertions(+), 2 deletions(-) > >diff --git a/circ/returns.pl b/circ/returns.pl >index 3e050a6..5c46152 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -269,7 +269,7 @@ if ($barcode) { > # Check if we should display a checkin message, based on the the item > # type of the checked in item > my $itemtype = Koha::ItemTypes->find( $biblio->{'itemtype'} ); >- if ($itemtype->checkinmsgtype eq 'question' && $accept != '1' && $accept !='2'){ >+ if (($itemtype->checkinmsgtype eq 'question' && $accept != '1' && $accept !='2')||$itemtype->checkinmsgtype ne 'question'){ > if ( $itemtype && $itemtype->checkinmsg ) { > $template->param( > checkinmsg => $itemtype->checkinmsg, >@@ -278,6 +278,11 @@ if ($barcode) { > ); > } > } >+ elsif($itemtype->checkinmsgtype eq 'question' && $accept == '2'){ >+ $template->param( >+ checkinmsgtype => "rejected", >+ ); >+ } > > # make sure return branch respects home branch circulation rules, default to homebranch > my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype ? $itemtype->itemtype : undef )->{'returnbranch'} || "homebranch"; >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 eeb7626..dc667b2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -548,7 +548,11 @@ $(document).ready(function () { > </form> > </div> > [% END%] >- >+[% IF checkinmsgtype == 'rejected' %] >+ <div class="dialog alert"> >+ <p class="problem">Your item was not checked in!</p> >+ </div> >+[% END %] > <div id="exemptfines" class="dialog message" style="display:none;"> > <p>Fines for returned items are forgiven.</p> > </div> >-- >2.7.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 17101
:
54380
|
54381
|
54386
|
54388
|
54389
|
54390
| 54425 |
54495