|
Description
Owen Leonard
2023-01-17 18:01:27 UTC
Created attachment 145369 [details] [review] Bug 32658: Use template wrapper in order from staged file template This patch implements the template WRAPPER system (see Bug 32571) for building tabs on the page for adding to a basket from a staged file. To test you need an active vendor, at least one basket for that vendor, and a staged MARC file. Apply the patch and go to Acquisitions -> Vendor -> Basket -> Add to basket -> From a staged file. - Click "Add to orders" on one of your staged files. - On the "Add orders from..." page you should see three tabs, the first one active. - Tabs should look correct and work correctly. Created attachment 145537 [details] [review] Bug 32658: (follow-up) Use more unique variable name to avoid collisions Created attachment 145568 [details] [review] Bug 32658: Use template wrapper in order from staged file template This patch implements the template WRAPPER system (see Bug 32571) for building tabs on the page for adding to a basket from a staged file. To test you need an active vendor, at least one basket for that vendor, and a staged MARC file. Apply the patch and go to Acquisitions -> Vendor -> Basket -> Add to basket -> From a staged file. - Click "Add to orders" on one of your staged files. - On the "Add orders from..." page you should see three tabs, the first one active. - Tabs should look correct and work correctly. Signed-off-by: David Nind <david@davidnind.com> Created attachment 145569 [details] [review] Bug 32658: (follow-up) Use more unique variable name to avoid collisions Signed-off-by: David Nind <david@davidnind.com> Please rebase! Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 32658: Use template wrapper in order from staged file template Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 32658: Use template wrapper in order from staged file template hint: Use 'git am --show-current-patch=diff' to see the failed 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-32658-Use-template-wrapper-in-order-from-stage-3QNVu8.patch Created attachment 146289 [details] [review] Bug 32658: Use template wrapper in order from staged file template This patch implements the template WRAPPER system (see Bug 32571) for building tabs on the page for adding to a basket from a staged file. To test you need an active vendor, at least one basket for that vendor, and a staged MARC file. Apply the patch and go to Acquisitions -> Vendor -> Basket -> Add to basket -> From a staged file. - Click "Add to orders" on one of your staged files. - On the "Add orders from..." page you should see three tabs, the first one active. - Tabs should look correct and work correctly. Signed-off-by: David Nind <david@davidnind.com> Created attachment 146290 [details] [review] Bug 32658: (follow-up) Use more unique variable name to avoid collisions Created attachment 147371 [details] [review] Bug 32658: Use template wrapper in order from staged file template This patch implements the template WRAPPER system (see Bug 32571) for building tabs on the page for adding to a basket from a staged file. To test you need an active vendor, at least one basket for that vendor, and a staged MARC file. Apply the patch and go to Acquisitions -> Vendor -> Basket -> Add to basket -> From a staged file. - Click "Add to orders" on one of your staged files. - On the "Add orders from..." page you should see three tabs, the first one active. - Tabs should look correct and work correctly. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Created attachment 147372 [details] [review] Bug 32658: (follow-up) Use more unique variable name to avoid collisions Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Pushed to master for 23.05. Nice work everyone, thanks! Nice work everyone! Pushed to stable for 22.11.x Enhancement will not be backported to 22.05.x |