Bug 33895 - Use template wrapper for tabs: OPAC user summary
Summary: Use template wrapper for tabs: OPAC user summary
Status: RESOLVED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Templates (show other bugs)
Version: Main
Hardware: All All
: P5 - low minor (vote)
Assignee: Owen Leonard
QA Contact: Marcel de Rooy
URL:
Keywords:
Depends on: 33891
Blocks: 32571
  Show dependency treegraph
 
Reported: 2023-06-05 13:19 UTC by Owen Leonard
Modified: 2023-12-28 20:47 UTC (History)
5 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.11.00


Attachments
Bug 33895: Use template wrapper for tabs: OPAC user summary (54.67 KB, patch)
2023-06-06 13:07 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on (1.44 KB, patch)
2023-06-06 16:17 UTC, Lucas Gass
Details | Diff | Splinter Review
Bug 33895: Use template wrapper for tabs: OPAC user summary (54.79 KB, patch)
2023-06-13 14:36 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on (1.44 KB, patch)
2023-06-13 14:36 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 33895: Use template wrapper for tabs: OPAC user summary (54.80 KB, patch)
2023-08-03 18:34 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on (1.44 KB, patch)
2023-08-03 18:34 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 33895: Use template wrapper for tabs: OPAC user summary (54.84 KB, patch)
2023-08-04 14:51 UTC, Sam Lau
Details | Diff | Splinter Review
Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on (1.49 KB, patch)
2023-08-04 14:51 UTC, Sam Lau
Details | Diff | Splinter Review
Bug 33895: Use template wrapper for tabs: OPAC user summary (54.93 KB, patch)
2023-08-25 09:14 UTC, Marcel de Rooy
Details | Diff | Splinter Review
Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on (1.58 KB, patch)
2023-08-25 09:14 UTC, Marcel de Rooy
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-06-05 13:19:57 UTC
Continuing the work of Bug 32571, I would like to update the OPAC user summary page use the new WRAPPER for tabs
Comment 1 Owen Leonard 2023-06-06 13:07:51 UTC Comment hidden (obsolete)
Comment 2 Lucas Gass 2023-06-06 16:14:58 UTC
I notice that when OverDriveCirculation is off the #opac-user-overdrive tab-pane is still built. Which leads to this error:

The aria-labelledby attribute must point to an element in the same document.
Comment 3 Lucas Gass 2023-06-06 16:17:52 UTC Comment hidden (obsolete)
Comment 4 Lucas Gass 2023-06-06 16:21:11 UTC
Owen, if you agree with my follow-up I'll go ahead and add sign off here. If not, happy to obsolete it.
Comment 5 Owen Leonard 2023-06-13 14:36:27 UTC
Created attachment 152298 [details] [review]
Bug 33895: Use template wrapper for tabs: OPAC user summary

This patch updates the OPAC user summary page so that it uses
the new WRAPPER syntax to generate tabs markup.

To test, apply the patch and log in to the OPAC. Check these tabs on
the patron summary page:

  - Checkouts
  - Relatives' checkouts
  - Relatives' charges
  - Overdues
  - Charges
  - Credits
  - Clubs
    - Test enrolling and unenrolling
  - Holds
  - Recalls
  - Article requests
  - Overdrive
    - Test with OverDriveCirculation enabled
    - Logging in, logging out
Comment 6 Owen Leonard 2023-06-13 14:36:29 UTC
Created attachment 152299 [details] [review]
Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on
Comment 7 Sam Lau 2023-08-03 16:26:32 UTC
Applying: Bug 33895: Use template wrapper for tabs: OPAC user summary
Using index info to reconstruct a base tree...
M	koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
M	koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 33895: Use template wrapper for tabs: OPAC user summary
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-33895-Use-template-wrapper-for-tabs-OPAC-user--VW0_jB.patch
Comment 8 Owen Leonard 2023-08-03 18:34:07 UTC
Created attachment 154231 [details] [review]
Bug 33895: Use template wrapper for tabs: OPAC user summary

This patch updates the OPAC user summary page so that it uses
the new WRAPPER syntax to generate tabs markup.

To test, apply the patch and log in to the OPAC. Check these tabs on
the patron summary page:

  - Checkouts
  - Relatives' checkouts
  - Relatives' charges
  - Overdues
  - Charges
  - Credits
  - Clubs
    - Test enrolling and unenrolling
  - Holds
  - Recalls
  - Article requests
  - Overdrive
    - Test with OverDriveCirculation enabled
    - Logging in, logging out
Comment 9 Owen Leonard 2023-08-03 18:34:09 UTC
Created attachment 154232 [details] [review]
Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on
Comment 10 Sam Lau 2023-08-04 14:51:40 UTC
Created attachment 154283 [details] [review]
Bug 33895: Use template wrapper for tabs: OPAC user summary

This patch updates the OPAC user summary page so that it uses
the new WRAPPER syntax to generate tabs markup.

To test, apply the patch and log in to the OPAC. Check these tabs on
the patron summary page:

  - Checkouts
  - Relatives' checkouts
  - Relatives' charges
  - Overdues
  - Charges
  - Credits
  - Clubs
    - Test enrolling and unenrolling
  - Holds
  - Recalls
  - Article requests
  - Overdrive
    - Test with OverDriveCirculation enabled
    - Logging in, logging out

Signed-off-by: Sam Lau <samalau@gmail.com>
Comment 11 Sam Lau 2023-08-04 14:51:43 UTC
Created attachment 154284 [details] [review]
Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on

Signed-off-by: Sam Lau <samalau@gmail.com>
Comment 12 Marcel de Rooy 2023-08-25 09:14:39 UTC
Created attachment 154785 [details] [review]
Bug 33895: Use template wrapper for tabs: OPAC user summary

This patch updates the OPAC user summary page so that it uses
the new WRAPPER syntax to generate tabs markup.

To test, apply the patch and log in to the OPAC. Check these tabs on
the patron summary page:

  - Checkouts
  - Relatives' checkouts
  - Relatives' charges
  - Overdues
  - Charges
  - Credits
  - Clubs
    - Test enrolling and unenrolling
  - Holds
  - Recalls
  - Article requests
  - Overdrive
    - Test with OverDriveCirculation enabled
    - Logging in, logging out

Signed-off-by: Sam Lau <samalau@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Comment 13 Marcel de Rooy 2023-08-25 09:14:41 UTC
Created attachment 154786 [details] [review]
Bug 33895: (follow-up) Build overdrive tab-pane only if OverDriveCirculation is turned on

Signed-off-by: Sam Lau <samalau@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Comment 14 Marcel de Rooy 2023-08-25 09:16:13 UTC
Looks good to me, but harder to verify if changes like this introduce (tiny) regressions somewhere in all template changes. Not talking about rebasing..
Comment 15 Tomás Cohen Arazi 2023-09-05 17:37:57 UTC
Pushed to master for 23.11.

Nice work everyone, thanks!
Comment 16 Fridolin Somers 2023-09-08 06:48:17 UTC
Does not apply in 23.05.x
Conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc