Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[REF] Fix up Message template gencode to work with Smarty 3 #27727

Merged
merged 1 commit into from
Oct 6, 2023
Merged

[REF] Fix up Message template gencode to work with Smarty 3 #27727

merged 1 commit into from
Oct 6, 2023

Conversation

seamuslee001
Copy link
Contributor

Overview

This modifies the way gencode works for message templates to make it work with smarty 3

Before

Gencode message template doesn't work with Smarty 3

After

Gencode Message template works with Smarty 3

ping @eileenmcnaughton @larssandergreen

@civibot
Copy link

civibot bot commented Oct 5, 2023

🤖 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...

➡️ Online demo of this PR 🔗

@civibot civibot bot added the master label Oct 5, 2023
@seamuslee001 seamuslee001 force-pushed the message_template_gencode_smarty3 branch 2 times, most recently from 43e16ab to dac2156 Compare October 6, 2023 00:16
@seamuslee001 seamuslee001 force-pushed the message_template_gencode_smarty3 branch from dac2156 to f487011 Compare October 6, 2023 00:36
eileenmcnaughton
eileenmcnaughton reviewed Oct 6, 2023
View reviewed changes
CRM/Core/CodeGen/Util/MessageTemplates.php
];
$smarty->assign('ogNames', $ogNames);
$smarty->assign('ovNames', $ovNames);
$dir = $smarty->get_template_vars()['gencodeXmlDir'] . '/templates/message_templates/sample';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't matter per se but because we merged the smarty compatibility class getTemplateVars() is preferred - that's the v3 version so at some point we need to swap although both work right now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeh it might matter more here because of https://github.com/civicrm/civicrm-core/pull/27727/files#diff-2131b62e0019c60c9029efe45018ac61ae5f687d791013825679af5f9bdf28edR17 doesn't use the compatibility class

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok - we might as well punt switching that one then!

@eileenmcnaughton
Copy link
Contributor

well it works! now just digging into some minor things I spotted while testing

@eileenmcnaughton eileenmcnaughton merged commit a220e7d into civicrm:master Oct 6, 2023
@eileenmcnaughton eileenmcnaughton deleted the message_template_gencode_smarty3 branch October 6, 2023 02:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eileenmcnaughton eileenmcnaughton eileenmcnaughton left review comments

Assignees
No one assigned
Labels
master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@seamuslee001 @eileenmcnaughton