https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 --- Comment #1 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 80985 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=80985&action=edit Bug 21628: Simplify holds awating pickup report To test: 1 - Place a number of holds 2 - Check in the items and confirm the holds 3 - Visit /cgi-bin/koha/circ/waitingreserves.pl 4 - View the report 5 - Apply patch 6 - Confirm that the report looks the same 7 - Confirm cancelling holds works as before -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 Alex Buckley <alexbuckley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |alexbuckley@catalyst.net.nz --- Comment #2 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Hi Nick Can you please rebase your patch, it is failing on waitingreserves.tt Applying: Bug 21628: Simplify holds awating pickup report Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt Failed to merge in the changes. Patch failed at 0001 Bug 21628: Simplify holds awating pickup report 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-21628-Simplify-holds-awating-pickup-report-eTjzAf.patch You have new mail in /var/mail/vagrant Cheers, Alex -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #80985|0 |1 is obsolete| | --- Comment #3 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 81473 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=81473&action=edit Bug 21628: Simplify holds awating pickup report To test: 1 - Place a number of holds 2 - Check in the items and confirm the holds 3 - Visit /cgi-bin/koha/circ/waitingreserves.pl 4 - View the report 5 - Apply patch 6 - Confirm that the report looks the same 7 - Confirm cancelling holds works as before -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 --- Comment #5 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 81486 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=81486&action=edit Bug 21628: (follow-up) Indentation and filter corrections This patch modifies the new waiting_holds.inc to fix the indentation. A template variable filter has been added to quiet QA tool warnings. Buttons are now styled as Bootstrap buttons. To test, apply the patch and view the holds report. Confirm that everything looks correct. Validate the HTML and confirm that there are no errors in the HTML of the body of the page. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 Alex Buckley <alexbuckley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #81486|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 --- Comment #6 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Created attachment 81610 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=81610&action=edit Bug 21628: Simplify holds awating pickup report To test: 1 - Place a number of holds 2 - Check in the items and confirm the holds 3 - Visit /cgi-bin/koha/circ/waitingreserves.pl 4 - View the report 5 - Apply patch 6 - Confirm that the report looks the same 7 - Confirm cancelling holds works as before Signed-off-by: Owen Leonard <oleonard@myacpl.org> Followed test plan, patch worked as described Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 Alex Buckley <alexbuckley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #81610|0 |1 is obsolete| | Attachment #81611|0 |1 is obsolete| | --- Comment #8 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 81776 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=81776&action=edit Bug 21628: Simplify holds awating pickup report To test: 1 - Place a number of holds 2 - Check in the items and confirm the holds 3 - Visit /cgi-bin/koha/circ/waitingreserves.pl 4 - View the report 5 - Apply patch 6 - Confirm that the report looks the same 7 - Confirm cancelling holds works as before Signed-off-by: Owen Leonard <oleonard@myacpl.org> Followed test plan, patch worked as described Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |josef.moravec@gmail.com |y.org | CC| |josef.moravec@gmail.com -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21628 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Pushed to Master |RESOLVED CC| |martin.renvoize@ptfs-europe | |.com --- Comment #11 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Enhancement, will not be backported to 18.05.x series. -- You are receiving this mail because: You are watching all bug changes.