Created attachment 17272 [details] [review] Bug 9860 Incorrect box heading (Cannot check in) when a document is late 'Cannot check in' heading had to be displayed when an invalid return (withdrawn, not check out etc.) is processed but not when a late document is checked in. Test plan : 1. Apply patch 2. Check in Invalid Item 3. See that 'Cannot check in' header is displayed 4. Check in a late document 5. See that 'Cannot check in' header is NOT displayed 6. Sign off In order to understand the problem that needs to be fixed here we have to look at the cause: Bug 9397. The patch for that bug made the incorrect assumption that for all check-in error messages the appropriate message is "Cannot check in." As this bug shows, this is not correct. In fact the way the template was before Bug 9397 is more correct. A correct fix which covered the goals of both bugs would revert the changes made by bug 9397 and add a generic heading for all check-in messages. "Check in notice" or something vague like that. Created attachment 17292 [details] [review] 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. Created attachment 17304 [details] [review] 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> QA comment: My fault, I amended the patch for bug 9397 too quickly! This one is a string patch and fix correctly the message problem. Marked as Passed QA. Created attachment 17555 [details] [review] 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> This patch has been pushed to master and 3.12.x. Pushed to 3.10.x will be in 3.10.6 |
Created attachment 16458 [details] cannot check in When a late document is checked in, every thing works as it should (the check in is correctly recorded) except that the warning box displays, in addition to the usual restriction applied to patron, an extra and inappropriate heading 'Cannot check in'. (cf joined image).