Description
Stuart Johnson
2018-03-20 08:41:29 UTC
Created attachment 77637 [details] [review] Bug 20450: Add collection to item table when placing a hold on a specific copy (Intranet) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in staff: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected Created attachment 77638 [details] [review] Bug 20450: Add collection to item table when placing a hold on a specific copy (OPAC) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in OPAC: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected Separate patches as the initial request was for staff, but I think useful in the OPAC too. Created attachment 78888 [details] screenshot of the OPAC results The staff interface works as planned. The OPAC does not. The attached image shows the problem. This text that shows in the results is: <<<<<<< HEAD ======= >>>>>>> Bug 20450: Add collection to item table when placing a hold on a specific copy (OPAC) <<<<<<< HEAD ======= >>>>>>> Bug 20450: Add collection to item table when placing a hold on Created attachment 78923 [details] [review] Bug 20450: Add collection to item table when placing a hold on a specific copy (Intranet) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in staff: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected Created attachment 78924 [details] [review] Bug 20450: Add collection to item table when placing a hold on a specific copy (OPAC) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in OPAC: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected Rebased and ready for testing! Created attachment 79532 [details] [review] Bug 20450: Add collection to item table when placing a hold on a specific copy (OPAC) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in OPAC: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 79533 [details] [review] Bug 20450: (follow-up) Add missing template filters This patch adds two missing template filters as pointed out by the template test. Hi Owen, strangely your follow-up doesn't apply for me: Applying: Bug 20450: (follow-up) Add missing template filters fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 20450: (follow-up) Add missing template filters 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-20450-follow-up-Add-missing-template-filters-z1lB0g.patch Can you help me out? Created attachment 79604 [details] [review] Bug 20450: Add collection to item table when placing a hold on a specific copy (Intranet) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in staff: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 79605 [details] [review] Bug 20450: Add collection to item table when placing a hold on a specific copy (OPAC) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in OPAC: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 79606 [details] [review] Bug 20450: (follow-up) Add missing template filters This patch adds two missing template filters as pointed out by the template test. (In reply to Katrin Fischer from comment #10) > strangely your follow-up doesn't apply for me Sorry, I didn't attach my patches correctly. Created attachment 79658 [details] [review] Bug 20450: (follow-up) Add missing template filters This patch adds two missing template filters as pointed out by the template test. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Thank you for the follow-up, Owen! Created attachment 80516 [details] [review] Bug 20450: Add collection to item table when placing a hold on a specific copy (Intranet) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in staff: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 80517 [details] [review] Bug 20450: Add collection to item table when placing a hold on a specific copy (OPAC) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in OPAC: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 80518 [details] [review] Bug 20450: (follow-up) Add missing template filters This patch adds two missing template filters as pointed out by the template test. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> A useful addition, code works well and no regressions found. Passing QA Awesome work all! Pushed to master for 18.11 Enhancement, will not be backported to 18.05.x series. |