To produce the confusing dialog: 1) Place an item belonging to Library A on hold for Patron 1 for pickup at Library B. 2) Trigger hold. Item is now in transit to Library B. 3) Check in item at Library C (item ended up in their hands by mistake). 4) Note 4 buttons. Not clear what to do. Realistically, the hold should be the focus, and sent along with either of the two bottom buttons. The top buttons do not need to be there. Why transfer the item home when it will just continue to trigger the hold?
Created attachment 62990 [details] [review] Bug 18503: Fixes confusing dialog and other minor This corrects the returns2 dialog logic, and cleans up a few pieces of code. Patch also updates some buttons and fixes check in layout. To Test: 1) Check out an item. 2) Check item in. Note old buttons (Submit next to barcode, Clear). Note message next to calendar is wrapping to next line. Note Clear button is next to the check box rather than next to the calendar. 3) Check in item at a different branch both with AllowReturnToBranch in all four settings and with AutomaticItemReturn set to Do and Don't. Note old style buttons on all dialogs. 4) Place a hold on an item for pickup at another library. 5) Trigger the hold and confirm. 6) Check in item at another library (not the pickup location). 7) Note the confusing transfer/hold buttons and message. 8) Apply patch 9) Repeat steps 1-8. Note changes to the items pointed out in those steps.
Hi Christopher When I apply this patch on a up to date clean branch I get the following error: Applying: Bug 18503: Fixes confusing dialog and other minor fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 18503: Fixes confusing dialog and other minor The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-18503-Fixes-confusing-dialog-and-other-minor-JMU2nv.patch
Did you apply the(In reply to Alex Buckley from comment #2) > Hi Christopher > > When I apply this patch on a up to date clean branch I get the following > error: > > Applying: Bug 18503: Fixes confusing dialog and other minor > fatal: sha1 information is lacking or useless > (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 Bug 18503: Fixes confusing dialog and other minor > The copy of the patch that failed is found in: > /home/vagrant/kohaclone/.git/rebase-apply/patch > When you have resolved this problem run "git bz apply --continue". > If you would prefer to skip this patch, instead run "git bz apply --skip". > To restore the original branch and stop patching run "git bz apply --abort". > Patch left in > /tmp/Bug-18503-Fixes-confusing-dialog-and-other-minor-JMU2nv.patch Did you apply patch 18490? This patch depends on it.
Yup I applied bug 18490 first
Created attachment 66494 [details] [review] Bug 18503: Fixes confusing dialog and other minor This corrects the returns2 dialog logic, and cleans up a few pieces of code. Patch also updates some buttons and fixes check in layout. To Test: 1) Check out an item. 2) Check item in. Note old buttons (Submit next to barcode, Clear). Note message next to calendar is wrapping to next line. Note Clear button is next to the check box rather than next to the calendar. 3) Check in item at a different branch both with AllowReturnToBranch in all four settings and with AutomaticItemReturn set to Do and Don't. Note old style buttons on all dialogs. 4) Place a hold on an item for pickup at another library. 5) Trigger the hold and confirm. 6) Check in item at another library (not the pickup location). 7) Note the confusing transfer/hold buttons and message. 8) Apply patch 9) Repeat steps 1-8. Note changes to the items pointed out in those steps.
Rebased. Sorry for delay! Please try again.
Confirm button doesn't trigger hold at remote library. Regression of a bug. Need to fix.
Hi Christopher, you might have run into bug 19116
(In reply to Katrin Fischer from comment #8) > Hi Christopher, you might have run into bug 19116 I believe you are correct. I was thinking I might have broke something, but I do recall this bug coming up on one of our last upgrades, and someone fixed it (probably applied the patch). I have tested, and it is a pre-existing condition that this patch doesn't address, so we are good to go. Thanks!
I tried to apply the patch, and the system gave me an error fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt).
I see some things have changed since I have been able to work on this. I am going to rework the patch and some of the elements being addressed.
Looks like some things are already fixed, and some things are being addressed elsewhere. So I am closing this bug, and I am going to start a new bug to address some of the leftovers.