Bug 32658 - Use template wrapper in order from staged file template
Summary: Use template wrapper in order from staged file template
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Templates (show other bugs)
Version: Main
Hardware: All All
: P5 - low enhancement (vote)
Assignee: Owen Leonard
QA Contact: Katrin Fischer
URL:
Keywords:
Depends on: 32571
Blocks:
  Show dependency treegraph
 
Reported: 2023-01-17 18:01 UTC by Owen Leonard
Modified: 2023-12-28 20:43 UTC (History)
2 users (show)

See Also:
Change sponsored?: ---
Patch complexity: Small patch
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:
23.05.00,22.11.04


Attachments
Bug 32658: Use template wrapper in order from staged file template (5.47 KB, patch)
2023-01-17 19:38 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 32658: (follow-up) Use more unique variable name to avoid collisions (1.89 KB, patch)
2023-01-20 16:19 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 32658: Use template wrapper in order from staged file template (5.52 KB, patch)
2023-01-22 19:38 UTC, David Nind
Details | Diff | Splinter Review
Bug 32658: (follow-up) Use more unique variable name to avoid collisions (1.94 KB, patch)
2023-01-22 19:38 UTC, David Nind
Details | Diff | Splinter Review
Bug 32658: Use template wrapper in order from staged file template (16.33 KB, patch)
2023-02-06 16:23 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 32658: (follow-up) Use more unique variable name to avoid collisions (1.88 KB, patch)
2023-02-06 16:23 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 32658: Use template wrapper in order from staged file template (16.39 KB, patch)
2023-02-24 17:04 UTC, Katrin Fischer
Details | Diff | Splinter Review
Bug 32658: (follow-up) Use more unique variable name to avoid collisions (1.94 KB, patch)
2023-02-24 17:04 UTC, Katrin Fischer
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Owen Leonard 2023-01-17 18:01:27 UTC
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.
Comment 1 Owen Leonard 2023-01-17 19:38:15 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.
Comment 2 Owen Leonard 2023-01-20 16:19:46 UTC
Created attachment 145537 [details] [review]
Bug 32658: (follow-up) Use more unique variable name to avoid collisions
Comment 3 David Nind 2023-01-22 19:38:01 UTC
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>
Comment 4 David Nind 2023-01-22 19:38:07 UTC
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>
Comment 5 Katrin Fischer 2023-02-05 13:11:03 UTC
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
Comment 6 Owen Leonard 2023-02-06 16:23:29 UTC
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>
Comment 7 Owen Leonard 2023-02-06 16:23:34 UTC
Created attachment 146290 [details] [review]
Bug 32658: (follow-up) Use more unique variable name to avoid collisions
Comment 8 Katrin Fischer 2023-02-24 17:04:29 UTC
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>
Comment 9 Katrin Fischer 2023-02-24 17:04:32 UTC
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>
Comment 10 Tomás Cohen Arazi 2023-03-06 17:47:05 UTC
Pushed to master for 23.05.

Nice work everyone, thanks!
Comment 11 Matt Blenkinsop 2023-03-09 09:34:13 UTC
Nice work everyone!

Pushed to stable for 22.11.x
Comment 12 Lucas Gass 2023-03-14 20:14:05 UTC
Enhancement will not be backported to 22.05.x