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

Tpl notice fixes #21503

Merged
merged 1 commit into from
Sep 16, 2021
Merged

Tpl notice fixes #21503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions templates/CRM/Activity/Form/Search/Common.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
{else}
<td>&nbsp;</td>
{/if}
{if $form.activity_survey_id || $buildEngagementLevel}
{if !empty($form.activity_survey_id) || $buildEngagementLevel}
<td>
{if $form.activity_survey_id}
{if !empty($form.activity_survey_id)}
<label>{$form.activity_survey_id.label}</label>
<br/>
{$form.activity_survey_id.html}
Expand Down Expand Up @@ -60,7 +60,7 @@
</td>
</tr>

{if $form.activity_tags}
{if !empty($form.activity_tags)}
<tr>
<td><label>{$form.activity_tags.label}</label>
<br/>
Expand Down
9 changes: 8 additions & 1 deletion templates/CRM/Activity/Form/Selector.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,14 @@

<td>{$row.activity_status}</td>

<td>{$row.action|replace:'xx':$row.id}</td>
<td>
{if (!empty($row.id))}
{$row.action|replace:'xx':$row.id}
Copy link
Contributor

Choose a reason for hiding this comment

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

I had left this one out of a previous PR because I don't think this replacement ever actually happens, just hadn't got around to confirming it. Not a blocker just I might end up forgetting about it if it never displays again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I wondered about that

{else}
{$row.action}
{/if}
</td>

</tr>
{/foreach}

Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/common/displaySearchCriteria.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div class="qill">
{$item|escape}
{if !$smarty.foreach.criteria.last}
{if $operator}
{if !empty($operator)}
<span class="font-italic">...{$operator|escape}...</span>
{else}
<span class="font-italic">...{ts}AND{/ts}...</span>
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/common/searchResultTasks.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<table class="form-layout-compressed">
<tr>
<td class="font-size12pt" style="width: 40%;">
{if $savedSearch.name}{$savedSearch.name} ({ts}smart group{/ts}) - {/if}
{ts count=$pager->_totalItems plural='%count Results'}%count Result{/ts}{if $selectorLabel}&nbsp;-&nbsp;{$selectorLabel}{/if}
{if !empty($savedSearch.name)}{$savedSearch.name} ({ts}smart group{/ts}) - {/if}
{ts count=$pager->_totalItems plural='%count Results'}%count Result{/ts}{if !empty($selectorLabel)}&nbsp;-&nbsp;{$selectorLabel}{/if}
{if $context == 'Event' && $participantCount && ( $pager->_totalItems ne $participantCount ) }
<br />{ts}Actual participant count{/ts} : {$participantCount} {help id="id-actual_participant_count" file="CRM/Event/Form/Search/Results.hlp"} &nbsp;
{/if}
Expand Down