Fix event templates to use end_date token #27005
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for contributing to CiviCRM! ❤️ We will need to test and review the PR. 👷 Introduction for new contributors
Quick links for reviewers |
| @@ -38,7 +38,7 @@ | |||
| ==========================================================={if !empty($pricesetFieldsCount) }===================={/if} | |||
|
|
|||
| {event.title} | |||
| {event.start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} | |||
| {event.start_date|crmDate}{if {event.end_date|boolean}}-{if '{event.end_date|crmDate:"%Y%m%d"}' === '{event.start_date|crmDate:"%Y%m%d"}'}{event.end_date|crmDate:"Time"}{else}{event_end_date}{/if}{/if} | |||
There was a problem hiding this comment.
At the end of this line: {event_end_date}
There was a problem hiding this comment.
thanks @demeritcowboy
Re-assuring jenkins also spotted it - CRM_Event_Form_ParticipantTest::testSubmitWithDeferredRecognition
Exception: CRM_Core_Exception: "Message was not parsed due to invalid smarty syntax : Smarty error: [in evaluated template line 41]: syntax error: unrecognized tag 'event_end_date' (Smarty_Compiler.class.php, line 584)"
#0 internal function: CRM_Core_Smarty->handleSmartyError(256, "Smar
eileenmcnaughton
force-pushed
the
end_date
branch
4 times, most recently
from
35c7022 to
32d1feb
Compare
|
FYI merge conflict |
eileenmcnaughton
force-pushed
the
end_date
branch
from
32d1feb to
04abbd4
Compare
|
Thanks @demeritcowboy - rebased |
eileenmcnaughton
force-pushed
the
end_date
branch
from
04abbd4 to
3f794c8
Compare
|
test this please |
|
@demeritcowboy this is passing now... |
|
There's a bunch of errors but will post separately. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Fix event templates to use end_date token
Before
Uses
$event.event_end_dateAfter
Uses
{event.end_date}- note the conditional means only time shows when applicableTechnical Details
Comments