From 8dfdc5e33514443e463b1accc1053dc986def4d4 Mon Sep 17 00:00:00 2001 From: Benjamin Southall Date: Sat, 10 Aug 2019 12:01:07 +1000 Subject: [PATCH] Based on #157 and #158, revert back to existence checks and length rather than default empty array initialization for ease of reading --- templates/mod/inbox.html | 2 +- templates/mod/themes.html | 2 +- templates/mod/user.html | 2 +- templates/mod/view_ip.html | 6 +++--- templates/themes/basic/index.html | 2 +- templates/themes/categories/news.html | 2 +- templates/themes/frameset/news.html | 2 +- templates/themes/recent/recent.html | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/mod/inbox.html b/templates/mod/inbox.html index 614c1020..63f4de5c 100644 --- a/templates/mod/inbox.html +++ b/templates/mod/inbox.html @@ -1,4 +1,4 @@ -{% if messages|default([])|length == 0 %} +{% if not messages %}

({% trans 'No private messages for you.' %})

{% else %} diff --git a/templates/mod/themes.html b/templates/mod/themes.html index 99aaadf5..87639dbc 100644 --- a/templates/mod/themes.html +++ b/templates/mod/themes.html @@ -1,4 +1,4 @@ -{% if themes|default([])|length == 0 %} +{% if not themes %}

({% trans 'There are no themes available.' %})

{% else %}
diff --git a/templates/mod/user.html b/templates/mod/user.html index d72ac535..6cc454d8 100644 --- a/templates/mod/user.html +++ b/templates/mod/user.html @@ -87,7 +87,7 @@ -{% if logs|default([])|length > 0 %} +{% if logs and logslength > 0 %}
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html index 6735ff6f..20a4573d 100644 --- a/templates/mod/view_ip.html +++ b/templates/mod/view_ip.html @@ -18,7 +18,7 @@ {{ notes|count }} {% trans notes_on_record %} - {% if notes|default([])|length > 0 %} + {% if notes and noteslength > 0 %}
{% trans 'IP address' %}
@@ -81,7 +81,7 @@ {% endif %} -{% if bans|default([])|length > 0 and mod|hasPermission(config.mod.view_ban) %} +{% if bans and bans|length > 0 and mod|hasPermission(config.mod.view_ban) %}
{% set bans_on_record = 'ban' ~ (bans|count != 1 ? 's' : '') ~ ' on record' %} {{ bans|count }} {% trans bans_on_record %} @@ -174,7 +174,7 @@
{% endif %} -{% if logs|default([])|length > 0 %} +{% if logs and logs|length > 0 %}
History
{% trans 'Staff' %}
diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html index a444be71..94bc79d0 100644 --- a/templates/themes/basic/index.html +++ b/templates/themes/basic/index.html @@ -24,7 +24,7 @@ mascot
- {% if news|default([])|length == 0 %} + {% if not news %}

(No news to show.)

{% else %} {% for entry in news %} diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html index a51cc0f6..dc6387c5 100644 --- a/templates/themes/categories/news.html +++ b/templates/themes/categories/news.html @@ -14,7 +14,7 @@
- {% if news|default([])|length == 0 %} + {% if not news %}

{% trans %}(No news to show.){% endtrans %}

{% else %} {% for entry in news %} diff --git a/templates/themes/frameset/news.html b/templates/themes/frameset/news.html index 04f89f87..0719079f 100644 --- a/templates/themes/frameset/news.html +++ b/templates/themes/frameset/news.html @@ -13,7 +13,7 @@
- {% if news|default([])|length == 0 %} + {% if not news %}

(No news to show.)

{% else %} {% for entry in news %} diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html index 02132d03..0d131bff 100644 --- a/templates/themes/recent/recent.html +++ b/templates/themes/recent/recent.html @@ -36,7 +36,7 @@

Latest News

- {% if recent_news|default([])|length == 0 %} + {% if not recent_news %}

(No news to show.)

{% else %} {% for entry in recent_news %}