[Bug 32658] New: Use template wrapper in order from staged file template
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Bug ID: 32658 Summary: Use template wrapper in order from staged file template Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: enhancement Priority: P5 - low Component: Templates Assignee: oleonard@myacpl.org Reporter: oleonard@myacpl.org QA Contact: testopia@bugs.koha-community.org CC: testopia@bugs.koha-community.org Depends on: 32571 Continuing the work of Bug 32571, the template used when ordering from a staged file should be revised to use the new WRAPPER for tabs. Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32571 [Bug 32571] Use template wrapper to build tabbed components -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff Patch complexity|--- |Small patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 --- Comment #1 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 145369 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145369&action=edit 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. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 --- Comment #2 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 145537 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145537&action=edit Bug 32658: (follow-up) Use more unique variable name to avoid collisions -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 David Nind <david@davidnind.com> 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=32658 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145369|0 |1 is obsolete| | --- Comment #3 from David Nind <david@davidnind.com> --- Created attachment 145568 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145568&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145537|0 |1 is obsolete| | --- Comment #4 from David Nind <david@davidnind.com> --- Created attachment 145569 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145569&action=edit Bug 32658: (follow-up) Use more unique variable name to avoid collisions Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #5 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- 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 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145568|0 |1 is obsolete| | Attachment #145569|0 |1 is obsolete| | --- Comment #6 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 146289 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=146289&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 --- Comment #7 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 146290 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=146290&action=edit Bug 32658: (follow-up) Use more unique variable name to avoid collisions -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Bug 32658 depends on bug 32571, which changed state. Bug 32571 Summary: Use template wrapper to build tabbed components https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32571 What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to stable |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |katrin.fischer@bsz-bw.de |y.org | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #146289|0 |1 is obsolete| | --- Comment #8 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 147371 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=147371&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #146290|0 |1 is obsolete| | --- Comment #9 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 147372 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=147372&action=edit Bug 32658: (follow-up) Use more unique variable name to avoid collisions Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |23.05.00 released in| | Status|Passed QA |Pushed to master -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 --- Comment #10 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Pushed to master for 23.05. Nice work everyone, thanks! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)|23.05.00 |23.05.00,22.11.04 released in| | Status|Pushed to master |Pushed to stable -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 --- Comment #11 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Nice work everyone! Pushed to stable for 22.11.x -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED CC| |lucas@bywatersolutions.com Status|Pushed to stable |RESOLVED --- Comment #12 from Lucas Gass <lucas@bywatersolutions.com> --- Enhancement will not be backported to 22.05.x -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Bug 32658 depends on bug 32571, which changed state. Bug 32571 Summary: Use template wrapper to build tabbed components https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32571 What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32658 Bug 32658 depends on bug 32571, which changed state. Bug 32571 Summary: Use template wrapper to build tabbed components https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32571 What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org