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

Update a couple more tpl variables to tokens #27004

Merged
merged 1 commit into from
Aug 7, 2023
Merged

Update a couple more tpl variables to tokens #27004

merged 1 commit into from
Aug 7, 2023

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Aug 3, 2023 •
edited
Loading

Overview

  • event.is_public is already converted in the event online template
  • event.email_confirm_text is already tested as a token available in the offline template. The token layer should take care of the htmlise question

Before

After

Still works

image

Technical Details

Comments

I will do a regen once I've fixed a couple more (I'm looking at you 'dataArray')

@civibot
Copy link

civibot bot commented Aug 3, 2023

Thank you for contributing to CiviCRM! ❤️ We will need to test and review the 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

@civibot civibot bot added the master label Aug 3, 2023
@eileenmcnaughton
Copy link
Contributor Author

test this please

demeritcowboy
demeritcowboy reviewed Aug 4, 2023
View reviewed changes
xml/templates/message_templates/event_online_receipt_html.tpl Outdated
{if !empty($event.confirm_email_text) AND (empty($isOnWaitlist) AND empty($isRequireApproval))}
<p>{$event.confirm_email_text|htmlize}</p>
{if {event.confirm_email_text|boolean} AND (empty($isOnWaitlist) AND empty($isRequireApproval))}
<p>{event.confirm_email_text|boolean}</p>
Copy link
Contributor

Choose a reason for hiding this comment

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

I think boolean on line 30 is a typo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yep - well spotted

@eileenmcnaughton
Update a couple more tpl variables to tokens
814904c 
event.is_public is already converted in the event online template
- event.email_confirm_text is already tested as a token available
in the offline template. The token layer should take
care of the htmlise question
@demeritcowboy demeritcowboy merged commit 9e2ab95 into civicrm:master Aug 7, 2023
@eileenmcnaughton eileenmcnaughton deleted the offline_tokens branch August 7, 2023 19:34
@larssandergreen larssandergreen mentioned this pull request Aug 25, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@demeritcowboy demeritcowboy demeritcowboy 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
@eileenmcnaughton @demeritcowboy