Skip to content

Commit

Permalink
Merge pull request #13254 from mollux/fix-incorrect-twig-checks
Browse files Browse the repository at this point in the history 
Fix incorrect twig field checks for contacts and companies
  • Loading branch information
@escopecz
escopecz committed Jan 20, 2024
2 parents bee6b30 + 7cffadb commit a0e2f2b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions app/bundles/LeadBundle/Resources/views/Company/list_rows_contacts.html.twig
View file
Expand Up @@ -167,7 +167,7 @@
}]) %}
{% endif %}

{% if fields.core.email.value is not empty %}
{% if fields.core.email is defined %}
{% set custom = custom|merge([{
'attr': {
'data-toggle': 'ajaxmodal',
Expand Down Expand Up @@ -198,17 +198,17 @@
</td>
<td class="visible-md visible-lg">{{ fields.core.email.value|purify }}</td>
<td class="visible-md visible-lg">
{% set flag = fields.core.country is not empty and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
{% set flag = fields.core.country is defined and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
{% if flag is not empty %}
<img src="{{ flag }}" style="max-height: 24px;" class="mr-sm" />
{% endif %}
{% set location = [] %}
{% if fields.core.city.value is not empty %}
{% if fields.core.city is defined %}
{% set location = location|merge([fields.core.city.value]) %}
{% endif %}
{% if fields.core.state.value is not empty %}
{% if fields.core.state is defined %}
{% set location = location|merge([fields.core.state.value]) %}
{% elseif fields.core.country.value is not empty %}
{% elseif fields.core.country is defined %}
{% set location = location|merge([fields.core.country.value]) %}
{% endif %}
{{ location|join(', ') }}
Expand Down
8 changes: 4 additions & 4 deletions app/bundles/LeadBundle/Resources/views/Lead/_list_column_location.html.twig
View file
@@ -1,16 +1,16 @@
<td class="{{ class }}">
{% set flag = fields.core.country.value is not null ? assetGetCountryFlag(fields.core.country.value) : '' %}
{% set flag = fields.core.country is defined and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
{% if flag is not empty %}
<img src="{{ flag }}" style="max-height: 24px;" class="mr-sm" />
{% endif %}

{% set location = [] %}
{% if fields.core.city.value is not empty %}
{% if fields.core.city is defined %}
{% set location = location|merge([fields.core.city.value]) %}
{% endif %}
{% if fields.core.state.value is not empty %}
{% if fields.core.state is defined %}
{% set location = location|merge([fields.core.state.value]) %}
{% elseif fields.core.country.value is not empty %}
{% elseif fields.core.country is defined %}
{% set location = location|merge([fields.core.country.value]) %}
{% endif %}
{{ location|join(', ')|purify }}
Expand Down
8 changes: 4 additions & 4 deletions app/bundles/LeadBundle/Resources/views/Lead/grid_card.html.twig
View file
Expand Up @@ -32,20 +32,20 @@
<div class="text-muted mb-1 ellipsis">
<i class="fa fa-fw fa-map-marker mr-xs"></i>
{% set location = [] %}
{% if fields.core.city.value is not empty %}
{% if fields.core.city is defined %}
{% set location = location|merge([fields.core.city.value]) %}
{% endif %}
{% if fields.core.state.value is not empty %}
{% if fields.core.state is defined %}
{% set location = location|merge([fields.core.state.value]) %}
{% elseif fields.core.country.value is not empty %}
{% elseif fields.core.country is defined %}
{% set location = location|merge([fields.core.country.value]) %}
{% endif %}
{{ location|join(', ') }}
</div>
<div class="text-muted mb-1 ellipsis">
<i class="fa fa-fw fa-globe mr-xs"></i>{{ fields.core.country.value|default('') }}
</div>
{% set flag = fields.core.country.value is not null ? assetGetCountryFlag(fields.core.country.value) : '' %}
{% set flag = fields.core.country is defined and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
{% if flag is not empty %}
<div style="position: absolute; right: 30px; bottom: 30px">
<img src="{{ flag }}" style="max-height: 24px;" class="ml-sm" />
Expand Down
6 changes: 3 additions & 3 deletions app/bundles/LeadBundle/Resources/views/Lead/lead.html.twig
View file
Expand Up @@ -15,7 +15,7 @@
{% endif %}
{% endset %}

{% set flag = fields.core.country.value is not null ? assetGetCountryFlag(fields.core.country.value) : '' %}
{% set flag = fields.core.country is defined and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
{% set groups = fields|keys %}

{% block headerTitle %}
Expand All @@ -28,7 +28,7 @@
{% set buttons = [] %}

{# Send email button #}
{% if fields.core.email.value is not empty %}
{% if fields.core.email is defined %}
{% set buttons = buttons|merge([{
'attr': {
'id': 'sendEmailButton',
Expand Down Expand Up @@ -428,7 +428,7 @@
</h6>
<address class="text-muted">
{% if fields.core.address1 is defined %}{{ fields.core.address1.value|purify }}<br>{% endif %}
{% if fields.core.address2.value is not empty %}{{ fields.core.address2.value|purify }}<br>{% endif %}
{% if fields.core.address2 is defined %}{{ fields.core.address2.value|purify }}<br>{% endif %}
{{ lead.location|purify }}
{% if fields.core.zipcode is defined %}{{ fields.core.zipcode.value|purify }}{% endif %}
<br>
Expand Down

0 comments on commit a0e2f2b

Please sign in to comment.