Description
Galen Charlton
2013-08-16 19:35:39 UTC
Created attachment 44134 [details] [review] Bug 10744 - ExpireReservesMaxPickUpDelay has minor workflow conflicts with hold(s) over report Initial commit. Created attachment 44294 [details] [review] Bug 10744 - ExpireReservesMaxPickUpDelay has minor workflow conflicts with hold(s) over report Created attachment 44414 [details] [review] Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report Hold(s) over -report at circ/waitingreserves.pl doesn't work because ExpireReservesMaxPickup removes reserves from the koha.reserves-table to the koha.old_reserves-table. This patch adds a new column koha.reserves.pickupexpired telling when/if the reserve has got it's pickup duration expired. This date is used to pull old reserves to the waitingreserves-view. syspref 'PickupExpiredHoldsOverReportDuration' controls how many days after expiration old reserves are displayed on the report, and the values respect Koha::Calendar holidays Web tests included. Created attachment 44464 [details] [review] Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report Applying: Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report fatal: sha1 information is lacking or useless (C4/Reserves.pm). error: could not build fake ancestor Created attachment 106446 [details] [review] Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report Hold(s) over -report at circ/waitingreserves.pl doesn't work because ExpireReservesMaxPickup removes reserves from the koha.reserves-table to the koha.old_reserves-table. This patch adds a new column koha.reserves.pickupexpired telling when/if the reserve has got it's pickup duration expired. This date is used to pull old reserves to the waitingreserves-view. syspref 'PickupExpiredHoldsOverReportDuration' controls how many days after expiration old reserves are displayed on the report, and the values respect Koha::Calendar holidays To test: 1) Apply patch. 2) Enable 'ExpireReservesMaxPickUpDelay'. 3) Set some value to 'ReservesMaxPickUpDelay' and 'PickupExpiredHoldsOverReportDuration' (e.g. 2 and 7). 4) Find or create hold(s) waiting pickup and set their expiration date so it exceeds 'ReservesMaxPickUpDelay' but not 'PickupExpiredHoldsOverReportDuration'. 5) Confirm hold(s) are moved to 'Holds waiting over ...' list. 6) Run misc/cronjobs/holds/cancel_expired_holds.pl. 7) Confirm hold(s) are still displayed on the list. 8) Confirm from db that hold(s) have 'pickupexpired' set same as 'expirationdate'. 9) Set new value to 'PickupExpiredHoldsOverReportDuration' so it no longer covers hold(s) expiration date(s). 10) Confirm that hold(s) are no longer displayed in waiting list Also prove t/db_depentent/Koha/Old.t Fixed patch to apply master version and removed dependencies to other patches. The patch doesn't apply because the schema files have been changed. Please add the schema files to a separate patch and write e.g. DO NOT PUSH to it because the RM will handle updating it. For more info on database updates and schema changes please see https://wiki.koha-community.org/wiki/Database_updates Created attachment 110030 [details] [review] Bug 10744: DO NOT PUSH! Schema change Created attachment 110031 [details] [review] Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report Hold(s) over -report at circ/waitingreserves.pl doesn't work because ExpireReservesMaxPickup removes reserves from the koha.reserves-table to the koha.old_reserves-table. This patch adds a new column koha.reserves.pickupexpired telling when/if the reserve has got it's pickup duration expired. This date is used to pull old reserves to the waitingreserves-view. syspref 'PickupExpiredHoldsOverReportDuration' controls how many days after expiration old reserves are displayed on the report, and the values respect Koha::Calendar holidays To test: 1) Apply patch. 2) Enable 'ExpireReservesMaxPickUpDelay'. 3) Set some value to 'ReservesMaxPickUpDelay' and 'PickupExpiredHoldsOverReportDuration' (e.g. 2 and 7). 4) Find or create hold(s) waiting pickup and set their expiration date so it exceeds 'ReservesMaxPickUpDelay' but not 'PickupExpiredHoldsOverReportDuration'. 5) Confirm hold(s) are moved to 'Holds waiting over ...' list. 6) Run misc/cronjobs/holds/cancel_expired_holds.pl. 7) Confirm hold(s) are still displayed on the list. 8) Confirm from db that hold(s) have 'pickupexpired' set same as 'expirationdate'. 9) Set new value to 'PickupExpiredHoldsOverReportDuration' so it no longer covers hold(s) expiration date(s). 10) Confirm that hold(s) are no longer displayed in waiting list Also prove t/db_depentent/Koha/Old.t Couldn't apply patch during signoff. $ git bz apply 10744 Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report 110030 - Bug 10744: DO NOT PUSH! Schema change 110031 - Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 10744: DO NOT PUSH! Schema changes Using index info to reconstruct a base tree... M Koha/Schema/Result/OldReserve.pm M Koha/Schema/Result/Reserve.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Schema/Result/Reserve.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Reserve.pm Auto-merging Koha/Schema/Result/OldReserve.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/OldReserve.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 10744: DO NOT PUSH! Schema changes The copy of the patch that failed is found in: .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-10744-DO-NOT-PUSH-Schema-change-RxpQb0.patch Created attachment 119029 [details] [review] Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report Hold(s) over -report at circ/waitingreserves.pl doesn't work because ExpireReservesMaxPickup removes reserves from the koha.reserves-table to the koha.old_reserves-table. This patch adds a new column koha.reserves.pickupexpired telling when/if the reserve has got it's pickup duration expired. This date is used to pull old reserves to the waitingreserves-view. syspref 'PickupExpiredHoldsOverReportDuration' controls how many days after expiration old reserves are displayed on the report, and the values respect Koha::Calendar holidays To test: 1) Apply patch. 2) Enable 'ExpireReservesMaxPickUpDelay'. 3) Set some value to 'ReservesMaxPickUpDelay' and 'PickupExpiredHoldsOverReportDuration' (e.g. 2 and 7). 4) Find or create hold(s) waiting pickup and set their expiration date so it exceeds 'ReservesMaxPickUpDelay' but not 'PickupExpiredHoldsOverReportDuration'. 5) Confirm hold(s) are moved to 'Holds waiting over ...' list. 6) Run misc/cronjobs/holds/cancel_expired_holds.pl. 7) Confirm hold(s) are still displayed on the list. 8) Confirm from db that hold(s) have 'pickupexpired' set same as 'expirationdate'. 9) Set new value to 'PickupExpiredHoldsOverReportDuration' so it no longer covers hold(s) expiration date(s). 10) Confirm that hold(s) are no longer displayed in waiting list Also prove t/db_depentent/Koha/Old.t Created attachment 119030 [details] [review] Bug 10744: DO NOT PUSH! Schema changes Marking this as BLOCKED until its dependencies can be resolved. |