Because of the way the template logic works, having OnSiteCheckouts off but OnSiteCheckoutsForce on creates problems with what controls and information are displayed when a patron is blocked from checking out.
Created attachment 33094 [details] [review] Bug 13184 - Circulation template problems if OnSiteCheckouts is off but OnSiteCheckoutsForce is on Checks in the circulation template for on-site checkouts preferences did not take into account the possibility that someone might have accidentally turned OnSiteCheckouts off but left OnSiteCheckoutsForce turned on. This patch amends the template logic so that it works correctly for various combinations of settings. To test, apply the patch and test the following combinations of circumstances. Testing using both a patron who is blocked (expired, restricted, etc) and a patron who is not blocked, test with... 1. OnSiteCheckouts is on, OnSiteCheckoutsForce is on 2. OnSiteCheckouts is off, OnSiteCheckoutsForce is on 3. OnSiteCheckouts is off, OnSiteCheckoutsForce is off 4. OnSiteCheckouts is on, OnSiteCheckoutsForce is off Confirm that the checkout form is shown or not shown correctly according to the preferences you have set. Confirm that the "Only on-site checkouts are allowed" message is only shown in case #1. Note: This patch includes whitespace changes, so please diff accordingly.
Created attachment 33113 [details] [review] [SIGNED OFF] Bug 13184 - Circulation template problems if OnSiteCheckouts is off but OnSiteCheckoutsForce is on Checks in the circulation template for on-site checkouts preferences did not take into account the possibility that someone might have accidentally turned OnSiteCheckouts off but left OnSiteCheckoutsForce turned on. This patch amends the template logic so that it works correctly for various combinations of settings. To test, apply the patch and test the following combinations of circumstances. Testing using both a patron who is blocked (expired, restricted, etc) and a patron who is not blocked, test with... 1. OnSiteCheckouts is on, OnSiteCheckoutsForce is on 2. OnSiteCheckouts is off, OnSiteCheckoutsForce is on 3. OnSiteCheckouts is off, OnSiteCheckoutsForce is off 4. OnSiteCheckouts is on, OnSiteCheckoutsForce is off Confirm that the checkout form is shown or not shown correctly according to the preferences you have set. Confirm that the "Only on-site checkouts are allowed" message is only shown in case #1. Note: This patch includes whitespace changes, so please diff accordingly. Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Created attachment 33114 [details] [review] [PASSED QA] Bug 13184 - Circulation template problems if OnSiteCheckouts is off but OnSiteCheckoutsForce is on Checks in the circulation template for on-site checkouts preferences did not take into account the possibility that someone might have accidentally turned OnSiteCheckouts off but left OnSiteCheckoutsForce turned on. This patch amends the template logic so that it works correctly for various combinations of settings. To test, apply the patch and test the following combinations of circumstances. Testing using both a patron who is blocked (expired, restricted, etc) and a patron who is not blocked, test with... 1. OnSiteCheckouts is on, OnSiteCheckoutsForce is on 2. OnSiteCheckouts is off, OnSiteCheckoutsForce is on 3. OnSiteCheckouts is off, OnSiteCheckoutsForce is off 4. OnSiteCheckouts is on, OnSiteCheckoutsForce is off Confirm that the checkout form is shown or not shown correctly according to the preferences you have set. Confirm that the "Only on-site checkouts are allowed" message is only shown in case #1. Note: This patch includes whitespace changes, so please diff accordingly. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Tested on top of 10860 and 13179. Works as described, adding more checks in the templates.
Patch pushed to master. Thanks Owen!