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

Fix rendering of empty extra_fields div #542

Merged
merged 5 commits into from
Sep 9, 2024
Merged

Fix rendering of empty extra_fields div #542

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
477388e
Fix rendering of empty extra_fields
glenn-sorrentino Sep 7, 2024
64f01ac
Update profile.html
glenn-sorrentino Sep 7, 2024
ea54b72
Merge branch 'main' into me
glenn-sorrentino Sep 7, 2024
fb8ba42
Merge branch 'main' into me
glenn-sorrentino Sep 7, 2024
4a96744
Merge branch 'main' into me
glenn-sorrentino Sep 7, 2024
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
43 changes: 21 additions & 22 deletions hushline/templates/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,30 +46,29 @@ <h2 class="submit">
{'label': user.extra_field_label4, 'value': user.extra_field_value4, 'verified': user.extra_field_verified4}
]
%}
{%- set valid_fields = extra_fields | selectattr('label', 'defined') | selectattr('value', 'defined') | selectattr('value') | list -%}

{% if extra_fields | selectattr('label', 'defined') | selectattr('value', 'defined') %}
{% if valid_fields | length > 0 %}
<div class="extra-fields">
{% for field in extra_fields %}
{% if field.label and field.value %}
<p class="extra-field">
<span class="extra-field-label">{{ field.label }}</span>
<span class="extra-field-value">
{% if field.verified %}
<span class="icon verifiedURL" title="Verified Address"></span>
{% endif %}
{% if field.value.startswith('https://') %}
<a
href="{{ field.value }}"
target="_blank"
rel="noopener noreferrer me"
>{{ field.value }}</a
>
{% else %}
{{ field.value }}
{% endif %}
</span>
</p>
{% endif %}
{% for field in valid_fields %}
<p class="extra-field">
<span class="extra-field-label">{{ field.label }}</span>
<span class="extra-field-value">
{% if field.verified %}
<span class="icon verifiedURL" title="Verified Address"></span>
{% endif %}
{% if field.value.startswith('https://') %}
<a
href="{{ field.value }}"
target="_blank"
rel="noopener noreferrer me"
>{{ field.value }}</a
>
{% else %}
{{ field.value }}
{% endif %}
</span>
</p>
{% endfor %}
</div>
{% endif %}
Expand Down
Loading