|
Description
Martin Renvoize (ashimema)
2019-12-23 09:45:09 UTC
Created attachment 97450 [details] [review] Bug 24298: Add return enums to branchstransfer triggers Created attachment 97451 [details] [review] Bug 24298: Record transfer triggers for returns This patch adds handling to catch transfers that may have been triggered on item return. Created attachment 97506 [details] [review] Bug 24298: Add return enums to branchstransfer triggers Created attachment 97507 [details] [review] Bug 24298: Record transfer triggers for returns This patch adds handling to catch transfers that may have been triggered on item return. Test Plan: 1) Enable AutoItemReturn and accompanying system preference 2) Return an item to the wrong branch and note the transfer 3) Check the database for the new trigger value Created attachment 97535 [details] [review] Bug 24298: Add return enums to branchstransfer triggers Created attachment 97536 [details] [review] Bug 24298: Record transfer triggers for returns This patch adds handling to catch transfers that may have been triggered on item return. Created attachment 98292 [details] [review] Bug 24298: Add return enums to branchstransfer triggers Created attachment 98293 [details] [review] Bug 24298: Record transfer triggers for returns This patch adds handling to catch transfers that may have been triggered on item return. Created attachment 98294 [details] [review] Bug 24298: Add tests for ModItemTransfer Hi,
qa tools complains
FAIL koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
FAIL filters
missing_filter at line 522 ( <input type="hidden" name="trigger" value="[% trigger %]" />)
$raw/html?
Created attachment 99774 [details] [review] Bug 24298: Add return enums to branchstransfer triggers Created attachment 99775 [details] [review] Bug 24298: Record transfer triggers for returns This patch adds handling to catch transfers that may have been triggered on item return. Created attachment 99776 [details] [review] Bug 24298: Add tests for ModItemTransfer Created attachment 99777 [details] [review] Bug 24298: (follow-up) Add missing filter! (In reply to Bernardo Gonzalez Kriegel from comment #11) > Hi, > qa tools complains > > FAIL koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt > FAIL filters > missing_filter at line 522 ( > <input type="hidden" name="trigger" value="[% trigger %]" />) > > $raw/html? Thanks for taking a look Bernardo.. all fixed up in the followup :) Created attachment 99781 [details] [review] Bug 24298: Add return enums to branchstransfer triggers Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> updatedabase runs Ok Created attachment 99782 [details] [review] Bug 24298: Record transfer triggers for returns This patch adds handling to catch transfers that may have been triggered on item return. Test Plan: 1) Enable AutomaticItemReturn and accompanying system preference 2) Return an item to the wrong branch and note the transfer 3) Check the database for the new trigger value Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Added test plan. Works Ok, trigger saved in database. Created attachment 99783 [details] [review] Bug 24298: Add tests for ModItemTransfer Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> All 8 tests in 'ModItemTransfer tests' pass Created attachment 99784 [details] [review] Bug 24298: (follow-up) Add missing filter! Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> (In reply to Martin Renvoize from comment #5) > 1) Enable AutoItemReturn and accompanying system preference It is AutomaticItemReturn :) Created attachment 100621 [details] [review] Bug 24298: Add return enums to branchstransfer triggers Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> updatedabase runs Ok Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Created attachment 100622 [details] [review] Bug 24298: Record transfer triggers for returns This patch adds handling to catch transfers that may have been triggered on item return. Test Plan: 1) Enable AutomaticItemReturn and accompanying system preference 2) Return an item to the wrong branch and note the transfer 3) Check the database for the new trigger value Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Added test plan. Works Ok, trigger saved in database. Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Created attachment 100623 [details] [review] Bug 24298: Add tests for ModItemTransfer Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> All 8 tests in 'ModItemTransfer tests' pass Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Created attachment 100624 [details] [review] Bug 24298: (follow-up) Add missing filter! Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Created attachment 100625 [details] [review] Bug 24298: Update test count and use build_sample_item Signed-off-by: Nick Clemens <nick@bywatersolutions.com> One note here: AddIssue closes existing transfers but doesn't update the reason - probably 'Checkout' should be a transfer reason - this can be done on another bug I think (In reply to Nick Clemens from comment #27) > One note here: AddIssue closes existing transfers but doesn't update the > reason - probably 'Checkout' should be a transfer reason - this can be done > on another bug I think Hmm, yeah, I remember spotting that and pondering how to handle it. I think I opted at the time to defer that work.. the 'reason' is really all about what triggered the transfer in the first place rather than if/why it may have been cancelled. It's pretty bad that we wipe out all trace of where the item as meant to be getting transferred to in my opinion.. even if we cancel it we aught to really record where it was meant to go in case we want to restore it later. I think, as you say, I'll open another bug to work no this however. Nice work everyone! Pushed to master for 20.05 Nice work everyone! Pushed to master for 20.05 enhancement not backported to 19.11.x Shouldn't 'TransferTrigger' be included as empty elseif statement inside error messages loop in returns.pl? Now when I try to return item needing transfer with 'AutomaticItemReturn' disabled I get error: 'Unknown error code TransferTrigger at /var/Koha/circ/returns.pl line 542.' Taking a look now, thanks Created attachment 103792 [details] [review] Bug 24298: (RM follow-up) Re-introduce TransferTrigger drop through A rebase lost the fall through for TransferTrigger as a message. This patch simply adds back in the dropped elsif statement. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Nice work everyone! Pushed to master for 20.05 Good catch.. seems we lost it in a rebase somewhere along the line.. it was in my original local branch :) Pushing as an RM followup now |