From 88e1d419da6306753fc3a2698695b2a110e25a88 Mon Sep 17 00:00:00 2001
From: rachidatecs <rachid.mrad@ecstech.com>
Date: Thu, 10 Aug 2023 16:27:00 -0400
Subject: [PATCH 1/3] Fix bug by checking to see if first item in the result
 set for a change_list_results table row is a form before performing the
 checkbox slice/markup switch

---
 .../templates/admin/change_list_results.html  | 114 +++++++++++-------
 1 file changed, 68 insertions(+), 46 deletions(-)

diff --git a/src/registrar/templates/admin/change_list_results.html b/src/registrar/templates/admin/change_list_results.html
index a9c5e5b4d..34f733ad4 100644
--- a/src/registrar/templates/admin/change_list_results.html
+++ b/src/registrar/templates/admin/change_list_results.html
@@ -13,57 +13,49 @@ Load our custom filters to extract info from the django generated markup.
 {% endif %}
 {% if results %}
 <div class="results override-change_list_results">
-<table id="result_list" class="usa-table usa-table--borderless usa-table--striped">
+<table id="result_list">
 <thead>
 <tr>
 
-{# .gov - hardcode the select all checkbox #}
-<th scope="col" class="action-checkbox-column" title="Toggle all">
-    <div class="text">
-        <span>
-            <input type="checkbox" name="_selected_action" id="action-toggle">
-            <label for="action-toggle" class="usa-sr-only">Toggle all</label>
-        </span>
-    </div>
-    <div class="clear"></div>
-</th>
-{# .gov - don't let django generate the select all checkbox #}
-{% for header in result_headers|slice:"1:" %}
+{% if results.0.form %}
+    {# .gov - hardcode the select all checkbox #}
+    <th scope="col" class="action-checkbox-column" title="Toggle all">
+        <div class="text">
+            <span>
+                <input type="checkbox" name="_selected_action" id="action-toggle">
+                <label for="action-toggle" class="usa-sr-only">Toggle all</label>
+            </span>
+        </div>
+        <div class="clear"></div>
+    </th>
+    {# .gov - don't let django generate the select all checkbox #}
+    {% for header in result_headers|slice:"1:" %}  
+        <th scope="col"{{ header.class_attrib }}>
+        {% if header.sortable %}
+            {% if header.sort_priority > 0 %}
+            <div class="sortoptions">
+                <a class="sortremove" href="{{ header.url_remove }}" title="{% translate "Remove from sorting" %}"></a>
+                {% if num_sorted_fields > 1 %}<span class="sortpriority" title="{% blocktranslate with priority_number=header.sort_priority %}Sorting priority: {{ priority_number }}{% endblocktranslate %}">{{ header.sort_priority }}</span>{% endif %}
+                <a href="{{ header.url_toggle }}" class="toggle {% if header.ascending %}ascending{% else %}descending{% endif %}" title="{% translate "Toggle sorting" %}"></a>
+            </div>
+            {% endif %}
+        {% endif %}
+        <div class="text">{% if header.sortable %}<a href="{{ header.url_primary }}">{{ header.text|capfirst }}</a>{% else %}<span>{{ header.text|capfirst }}</span>{% endif %}</div>
+        <div class="clear"></div>
+    </th>{% endfor %}
 
-<th scope="col"{{ header.class_attrib }}>
-   {% if header.sortable %}
-     {% if header.sort_priority > 0 %}
-       <div class="sortoptions">
-         <a class="sortremove" href="{{ header.url_remove }}" title="{% translate "Remove from sorting" %}"></a>
-         {% if num_sorted_fields > 1 %}<span class="sortpriority" title="{% blocktranslate with priority_number=header.sort_priority %}Sorting priority: {{ priority_number }}{% endblocktranslate %}">{{ header.sort_priority }}</span>{% endif %}
-         <a href="{{ header.url_toggle }}" class="toggle {% if header.ascending %}ascending{% else %}descending{% endif %}" title="{% translate "Toggle sorting" %}"></a>
-       </div>
-     {% endif %}
-   {% endif %}
-   <div class="text">{% if header.sortable %}<a href="{{ header.url_primary }}">{{ header.text|capfirst }}</a>{% else %}<span>{{ header.text|capfirst }}</span>{% endif %}</div>
-   <div class="clear"></div>
-</th>{% endfor %}
+    </tr>
+    </thead>
+    <tbody>
 
-</tr>
-</thead>
-<tbody>
+    {% comment %}
+    .gov - hardcode the row checkboxes using the custom filters to extract
+    the value attribute's value, and a label based on the anchor elements's
+    text. Then edit the for loop to keep django from generating the row select 
+    checkboxes.
+    {% endcomment %}
 
-{% comment %} 
-{% for result in results %}
-{% if result.form.non_field_errors %}
-    <tr><td colspan="{{ result|length }}">{{ result.form.non_field_errors }}</td></tr>
-{% endif %}
-<tr>{% for item in result %}{{ item }}{% endfor %}</tr>
-{% endfor %} 
-{% endcomment %}
-
-{% comment %}
-.gov - hardcode the row checkboxes using the custom filters to extract
-the value attribute's value, and a label based on the anchor elements's
-text. Then edit the for loop to keep django from generating the row select 
-checkboxes.
-{% endcomment %}
-{% for result in results %}
+    {% for result in results %}
     {% if result.form.non_field_errors %}
         <tr><td colspan="{{ result|length }}">{{ result.form.non_field_errors }}</td></tr>
     {% endif %}
@@ -82,7 +74,37 @@ checkboxes.
             {{ item }}
         {% endfor %}
     </tr>
-{% endfor %}
+    {% endfor %}
+
+{% else %}
+    
+    {% for header in result_headers %}  
+    <th scope="col"{{ header.class_attrib }}>
+    {% if header.sortable %}
+        {% if header.sort_priority > 0 %}
+        <div class="sortoptions">
+            <a class="sortremove" href="{{ header.url_remove }}" title="{% translate "Remove from sorting" %}"></a>
+            {% if num_sorted_fields > 1 %}<span class="sortpriority" title="{% blocktranslate with priority_number=header.sort_priority %}Sorting priority: {{ priority_number }}{% endblocktranslate %}">{{ header.sort_priority }}</span>{% endif %}
+            <a href="{{ header.url_toggle }}" class="toggle {% if header.ascending %}ascending{% else %}descending{% endif %}" title="{% translate "Toggle sorting" %}"></a>
+        </div>
+        {% endif %}
+    {% endif %}
+    <div class="text">{% if header.sortable %}<a href="{{ header.url_primary }}">{{ header.text|capfirst }}</a>{% else %}<span>{{ header.text|capfirst }}</span>{% endif %}</div>
+    <div class="clear"></div>
+    </th>{% endfor %}
+
+    </tr>
+    </thead>
+    <tbody>
+
+    {% for result in results %}
+        {% if result.form.non_field_errors %}
+            <tr><td colspan="{{ result|length }}">{{ result.form.non_field_errors }}</td></tr>
+        {% endif %}
+        <tr>{% for item in result %}{{ item }}{% endfor %}</tr>
+    {% endfor %}
+
+{% endif %}
 
 </tbody>
 </table>

From a2f0fd9522d3f039e73f0dd0317ef8b7be41ecb1 Mon Sep 17 00:00:00 2001
From: rachidatecs <rachid.mrad@ecstech.com>
Date: Fri, 11 Aug 2023 12:18:24 -0400
Subject: [PATCH 2/3] revert USDWDS table markup which was removed by mistake

---
 src/registrar/templates/admin/change_list_results.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/admin/change_list_results.html b/src/registrar/templates/admin/change_list_results.html
index 34f733ad4..fb77bd785 100644
--- a/src/registrar/templates/admin/change_list_results.html
+++ b/src/registrar/templates/admin/change_list_results.html
@@ -13,7 +13,7 @@ Load our custom filters to extract info from the django generated markup.
 {% endif %}
 {% if results %}
 <div class="results override-change_list_results">
-<table id="result_list">
+<table id="result_list" class="usa-table usa-table--borderless usa-table--striped">
 <thead>
 <tr>
 

From 02556418f882b4a45b18547d0354e580b18e4a62 Mon Sep 17 00:00:00 2001
From: rachidatecs <rachid.mrad@ecstech.com>
Date: Fri, 11 Aug 2023 12:24:06 -0400
Subject: [PATCH 3/3] explain the 'results doesn't have a form as its first
 element', which is far away from its if

---
 src/registrar/templates/admin/change_list_results.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/admin/change_list_results.html b/src/registrar/templates/admin/change_list_results.html
index fb77bd785..9ee3f9f59 100644
--- a/src/registrar/templates/admin/change_list_results.html
+++ b/src/registrar/templates/admin/change_list_results.html
@@ -76,7 +76,7 @@ Load our custom filters to extract info from the django generated markup.
     </tr>
     {% endfor %}
 
-{% else %}
+{% else %} {# results doesn't have a form as its first element #}
     
     {% for header in result_headers %}  
     <th scope="col"{{ header.class_attrib }}>