Fix wonkyness if contribution page includes a profile with both groups & tags

[eileenmcnaughton]

Overview

Fix wonkyness if contribution page includes a profile with both groups & tags

Before

I'm not 100% sure what is meant by the issue https://lab.civicrm.org/dev/core/-/issues/4957 & specifically "Furthermore, and more importantly, the checkboxes are no longer rendered at all on the form."

But when I tested the contribution page with a profile with BOTH group & tag custom fields in it they were added as a block, twice

After

They are just added the once

Technical Details

Including TagsAndGroups.tpl seemed to be making it really complex! Instead I copied the bit relevant to each field into the caller

I really didn't want to copy back the fact each of the 2 fields is nested in a table but concluded it made sense for the rc / stable & could possibly go in master

Comments

[civibot]

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷

Introduction for new contributors...

• If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
• A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
• A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
• If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
• Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
• A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
• To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
• For more information about contributing, see CONTRIBUTING.md.

Quick links for reviewers...

• ➡️ PR Demo site (can be rebuilt with the command test this please).
• 📖 Review standards
• 🗒️ Review template (brief or verbose)

➡️ Online demo of this PR 🔗

[colemanw]

Merged per testing on GL issue.