From ed0624662dc80dda3f4f3ee9c72e948432bd2abc Mon Sep 17 00:00:00 2001
From: Roman P <pythonpro@gmail.com>
Date: Tue, 28 May 2019 18:40:24 +0400
Subject: [PATCH 1/2] Titlecase conversion of None

Closes #212
---
 .../device_registry/templates/device_info_security.html  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/device_registry/templates/device_info_security.html b/backend/device_registry/templates/device_info_security.html
index 150adb463..444b4cd93 100644
--- a/backend/device_registry/templates/device_info_security.html
+++ b/backend/device_registry/templates/device_info_security.html
@@ -93,12 +93,13 @@ <h4 class="tab-title">Security</h4>
               <tr>
                 <th scope="row">Firewall Enabled</th>
                 <td>
-                    {{ object.firewallstate.enabled|title|default_if_none:'N/A' }}
-                    {% if object.firewallstate.enabled is not None %}
-                      <span class="p-1 badge badge-pill badge-{{ object.firewallstate.enabled|yesno:"success,danger" }}">
+                  {% if object.firewallstate.enabled is None %}N/A{% else %}
+                    {{ object.firewallstate.enabled|title }}{% endif %}
+                  {% if object.firewallstate.enabled is not None %}
+                    <span class="p-1 badge badge-pill badge-{{ object.firewallstate.enabled|yesno:"success,danger" }}">
                         {{ object.firewallstate.enabled|yesno:"✓,✗" }}
                       </span>
-                    {% endif %}
+                  {% endif %}
                 </td>
               </tr>
               <tr>

From 4d41134b0191791357ebb691aab17d9917fc83a6 Mon Sep 17 00:00:00 2001
From: Roman P <pythonpro@gmail.com>
Date: Tue, 28 May 2019 21:41:38 +0400
Subject: [PATCH 2/2] A portion of improvements

- handle all '|title' filter usages
- use one 'if' instead of 2
---
 .../templates/device_info_security.html       | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/backend/device_registry/templates/device_info_security.html b/backend/device_registry/templates/device_info_security.html
index 444b4cd93..b8ff70da6 100644
--- a/backend/device_registry/templates/device_info_security.html
+++ b/backend/device_registry/templates/device_info_security.html
@@ -60,25 +60,27 @@ <h4 class="tab-title">Security</h4>
               </tr>
               <tr>
                   <th scope="row">AppArmor Enabled</th>
-                  <td>
-                    {{ object.deviceinfo.app_armor_enabled|title|default_if_none:'N/A' }}
-                    {% if object.deviceinfo.app_armor_enabled is not None %}
-                      <span class="p-1 badge badge-pill badge-{{ object.deviceinfo.app_armor_enabled|yesno:"success,warning" }}">
+                <td>
+                  {% if object.deviceinfo.app_armor_enabled is None %}N/A{% else %}
+                    {{ object.deviceinfo.app_armor_enabled|title }}
+                    <span
+                        class="p-1 badge badge-pill badge-{{ object.deviceinfo.app_armor_enabled|yesno:"success,warning" }}">
                         {{ object.deviceinfo.app_armor_enabled|yesno:"✓,✗" }}
                       </span>
-                    {% endif %}
-                  </td>
+                  {% endif %}
+                </td>
               </tr>
               <tr>
                   <th scope="row">Default Password Detected</th>
-                  <td>
-                    {{ object.deviceinfo.default_password|title|default_if_none:'N/A' }}
-                    {% if object.deviceinfo.default_password is not None %}
-                      <span class="p-1 badge badge-pill badge-{{ object.deviceinfo.default_password|yesno:"danger,success" }}">
+                <td>
+                  {% if object.deviceinfo.default_password is None %}N/A{% else %}
+                    {{ object.deviceinfo.default_password|title }}
+                    <span
+                        class="p-1 badge badge-pill badge-{{ object.deviceinfo.default_password|yesno:"danger,success" }}">
                         {{ object.deviceinfo.default_password|yesno:"✗,✓" }}
                       </span>
-                    {% endif %}
-                  </td>
+                  {% endif %}
+                </td>
               </tr>
               <tr>
                 <th scope="row">Logins</th>
@@ -94,8 +96,7 @@ <h4 class="tab-title">Security</h4>
                 <th scope="row">Firewall Enabled</th>
                 <td>
                   {% if object.firewallstate.enabled is None %}N/A{% else %}
-                    {{ object.firewallstate.enabled|title }}{% endif %}
-                  {% if object.firewallstate.enabled is not None %}
+                    {{ object.firewallstate.enabled|title }}
                     <span class="p-1 badge badge-pill badge-{{ object.firewallstate.enabled|yesno:"success,danger" }}">
                         {{ object.firewallstate.enabled|yesno:"✓,✗" }}
                       </span>