From f3e22543308733ea66a389074df88d44715f939e Mon Sep 17 00:00:00 2001
From: aronwk-aaron <aronwk.aaron@gmail.com>
Date: Mon, 11 Mar 2024 12:33:33 -0500
Subject: [PATCH] fix messed up table

---
 app/accounts.py                      | 22 ++++++++--------------
 app/templates/accounts/index.html.j2 |  8 ++------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/app/accounts.py b/app/accounts.py
index 4a1e570..e28f6ca 100644
--- a/app/accounts.py
+++ b/app/accounts.py
@@ -252,6 +252,9 @@ def get():
         # Delete
         # </a>
 
+        if not current_app.config["USER_ENABLE_EMAIL"]:
+            account["2"] = '''N/A'''
+
         if account["4"]:
             account["4"] = '''<h2 class="far fa-times-circle text-danger"></h2>'''
         else:
@@ -267,20 +270,11 @@ def get():
         else:
             account["6"] = '''<h2 class="far fa-check-square text-success"></h2>'''
 
-        if current_app.config["USER_ENABLE_EMAIL"]:
-            if account["8"]:
-                account["8"] = '''<h2 class="far fa-check-square text-success"></h2>'''
-            else:
-                account["8"] = '''<h2 class="far fa-times-circle text-danger"></h2>'''
+        if not current_app.config["USER_ENABLE_EMAIL"]:
+            account["8"] = '''<h2 class="far fa-times-circle text-muted"></h2>'''
+        elif account["8"]:
+            account["8"] = '''<h2 class="far fa-check-square text-success"></h2>'''
         else:
-            # shift columns to fill in gap of 2
-            account["2"] = account["3"]
-            account["3"] = account["4"]
-            account["4"] = account["5"]
-            account["5"] = account["6"]
-            account["6"] = account["7"]
-            # remove last two columns
-            del account["7"]
-            del account["8"]
+            account["8"] = '''<h2 class="far fa-times-circle text-danger"></h2>'''
 
     return data
diff --git a/app/templates/accounts/index.html.j2 b/app/templates/accounts/index.html.j2
index 8d60c8e..febcc90 100644
--- a/app/templates/accounts/index.html.j2
+++ b/app/templates/accounts/index.html.j2
@@ -14,17 +14,13 @@
         <tr>
             <th>Actions</th>
             <th>Name</th>
-            {% if config.USER_ENABLE_EMAIL %}
-              <th>Email</th>
-            {% endif %}
+            <th>Email</th>
             <th>GM Level</th>
             <th>Locked</th>
             <th>Banned</th>
             <th>Muted</th>
             <th>Registered</th>
-            {% if config.USER_ENABLE_EMAIL %}
-              <th>Email Confirmed</th>
-            {% endif %}
+            <th>Email Confirmed</th>
         </tr>
     </thead>
     <tbody></tbody>