Bugzilla – Attachment 17555 Details for
Bug 9860
Incorrect box heading 'Cannot check in' when a late document is returned
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9860 [Alternate] Incorrect box heading 'Cannot check in' when a late document is returned
Bug-9860-Alternate-Incorrect-box-heading-Cannot-ch.patch (text/plain), 2.35 KB, created by
Jonathan Druart
on 2013-04-19 14:31:01 UTC
(
hide
)
Description:
Bug 9860 [Alternate] Incorrect box heading 'Cannot check in' when a late document is returned
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2013-04-19 14:31:01 UTC
Size:
2.35 KB
patch
obsolete
>From 843cd5c7a58644453cd278d23ffeda8b97be9d58 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 8 Apr 2013 10:13:11 -0400 >Subject: [PATCH] Bug 9860 [Alternate] Incorrect box heading 'Cannot check in' > when a late document is returned > >The fix for Bug 9397 moved the "cannot check in" heading from within the >one conditional where it should have been displayed to the top of all >check-in errors/messages. "Cannot check in" is still only valid if the >item is withdrawn and BlockReturnOfWithdrawnItems is ON. > >In order to accomplish the goal of Bug 9397 while fixing Bug 9860 this >patch puts "cannot check in" back into the correct conditional and adds >a generic heading to check in messages for accessibility purposes. > >To test, check in items which will trigger a variety of errors >including: > >- item must be returned to home library >- item is lost >- item is withdrawn (wtih BlockReturnOfWithdrawnItems on and off) >- item is overdue > >...as well as items which should check in normally. Messages should >display correctly. > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > >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 a009c58..8923188 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -317,7 +317,7 @@ $(document).ready(function () { > > [% IF ( errmsgloop ) %] > <div class="dialog alert"> >- <h5>Cannot check in</h5> >+ <h3>Check in message</h3> > [% FOREACH errmsgloo IN errmsgloop %] > [% IF ( errmsgloo.badbarcode ) %] > <p class="problem">No item with barcode: [% errmsgloo.msg %]</p> >@@ -341,6 +341,7 @@ $(document).ready(function () { > [% END %] > [% IF ( errmsgloo.withdrawn ) %] > [% IF BlockReturnOfWithdrawnItems %] >+ <h5>Cannot check in</h5> > <p class="problem">Item is withdrawn. <strong>NOT CHECKED IN</strong></p> > [% ELSE %] > <p class="problem">Item is withdrawn.</p> >-- >1.7.10.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 9860
:
16458
|
17272
|
17292
|
17304
| 17555