From ddaf69fdc4da75f12f7a0dad9e6f37cba490e967 Mon Sep 17 00:00:00 2001
From: James Outterside <james.outterside@gmail.com>
Date: Thu, 28 Apr 2022 15:09:53 +0100
Subject: [PATCH 1/2] Fixed issue with Admin styling affecting newer versions
 of Django

---
 .../gdpr_assist/admin/pd_change_list.html     | 197 +++++++++---------
 1 file changed, 101 insertions(+), 96 deletions(-)

diff --git a/gdpr_assist/templates/gdpr_assist/admin/pd_change_list.html b/gdpr_assist/templates/gdpr_assist/admin/pd_change_list.html
index 53fd0e3..7fa1e3d 100644
--- a/gdpr_assist/templates/gdpr_assist/admin/pd_change_list.html
+++ b/gdpr_assist/templates/gdpr_assist/admin/pd_change_list.html
@@ -2,119 +2,124 @@
 {% load i18n static %}
 
 {% block extrastyle %}
-  {{ block.super }}
-  <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
-  {% if cl.formset %}
-    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
-  {% endif %}
-  {% if cl.formset or action_form %}
-    <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
-  {% endif %}
-  {{ media.css }}
-
-  <style>
-    #changelist table td:first-child {
-        width: 1.5em;
-    }
-    #changelist table td.group-head {
-        padding: 1em 0 0 0;
-    }
-  </style>
+    {{ block.super }}
+    <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}"/>
+    {% if cl.formset %}
+        <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}"/>
+    {% endif %}
+    {% if cl.formset or action_form %}
+        <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
+    {% endif %}
+    {{ media.css }}
+
+    <style>
+        #changelist table td:first-child {
+            width: 1.5em;
+        }
+
+        #changelist table td.group-head {
+            padding: 1em 0 0 0;
+        }
+    </style>
 {% endblock %}
 
 {% block extrahead %}
-{{ block.super }}
-{{ media.js }}
+    {{ block.super }}
+    {{ media.js }}
 {% endblock %}
 
 {% block breadcrumbs %}
-<div class="breadcrumbs">
-<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
-&rsaquo; GDPR
-&rsaquo; Personal Data
-</div>
+    <div class="breadcrumbs">
+        <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+        &rsaquo; GDPR
+        &rsaquo; Personal Data
+    </div>
 {% endblock %}
 
 {% block content %}
-<div id="content-main">
-    <div id="changelist" class="module filtered">
+    <div id="content-main">
+        <div id="changelist" class="module filtered">
+            <div class="changelist-form-container">
+                <div id="toolbar">
+                    <div class="search">
+                        <form action="." method="POST">
+                            {% csrf_token %}
+                            {{ form.term }}
+                            <input type="submit" value="Search">
+                        </form>
+                    </div>
+                </div>
 
-        <div id="toolbar">
-            <div class="search">
                 <form action="." method="POST">
                     {% csrf_token %}
-                    {{ form.term }}
-                    <input type="submit" value="Search">
-                </form>
-            </div>
-        </div>
-
-        <form action="." method="POST">
-            {% csrf_token %}
-            <input type="hidden" name="{{ form.term.name }}" value="{{ form.term.value }}">
-
-    {% for group in results %}
-        {% if forloop.first %}
-        <div class="actions">
-            <label>{{ form.action.label }}{{ form.action }} {{ form.action.errors }}</label>
-            <button type="submit" class="button" title="{% trans "Run the selected action" %}">{% trans "Go" %}</button>
-        </div>
+                    <input type="hidden" name="{{ form.term.name }}" value="{{ form.term.value }}">
+
+                    {% for group in results %}
+                        {% if forloop.first %}
+                            <div class="actions">
+                                <label>{{ form.action.label }}{{ form.action }} {{ form.action.errors }}</label>
+                                <button type="submit" class="button"
+                                        title="{% trans "Run the selected action" %}">{% trans "Go" %}</button>
+                            </div>
+
+                            <table>
+                            <thead>
+                            <tr>
+                                <th scope="col" class="action-checkbox-column">
+                                    <div class="text"><span><input id="action-toggle" type="checkbox"></span></div>
+                                    <div class="clear"></div>
+                                </th>
+
+                                <th scope="col">
+                                    <div class="text">Select all</div>
+                                </th>
+                            </tr>
+                            </thead>
+
+                            <tbody>
+                        {% endif %}
 
-        <table>
-            <thead>
-                <tr>
-                    <th scope="col" class="action-checkbox-column">
-                       <div class="text"><span><input id="action-toggle" type="checkbox"></span></div>
-                       <div class="clear"></div>
-                    </th>
-
-                    <th scope="col">
-                        <div class="text">Select all</div>
-                    </th>
-                </tr>
-            </thead>
-
-            <tbody>
-        {% endif %}
-
-                <tr>
-                    <td colspan="2" class="group-head">
-                        <h2>{{ group.app_label.title }}: {{ group.model_name.title }}</h2>
-                    </td>
-                </tr>
-
-                {% if not group.model.check_can_anonymise %}
                     <tr>
-                        <td colspan="2">
-                            {% url group.url_change_name as obj_change_url %}
-                            These records will not be anonymised, they can be exported or if you wish to delete them
-                            please do so via their <a href="{{ obj_change_url }}">admin page</a>.
+                        <td colspan="2" class="group-head">
+                            <h2>{{ group.app_label.title }}: {{ group.model_name.title }}</h2>
                         </td>
                     </tr>
-                {% endif %}
-                {% for obj in group.results %}
-                <tr class="row1">
-                    <td class="action-checkbox">
-                        <input name="obj_pk" value="{{ group.content_type.pk }}-{{ obj.pk }}" class="action-select" type="checkbox">
-                    </td>
-                    <td class="field-username">
-                        {% url group.url_name obj.pk as obj_url %}
-                        {% if obj_url %}<a href="{{ obj_url }}">{% endif %}{{ obj }}{% if obj_url %}</a>{% endif %}
-                    </td>
-                </tr>
-                {% endfor %}
-
-        {% if forloop.last %}
-            </tbody>
-        </table>
-        {% endif %}
-    {% empty %}
-        <p>No results found.</p>
-    {% endfor %}
-
-        </form>
+
+                    {% if not group.model.check_can_anonymise %}
+                        <tr>
+                            <td colspan="2">
+                                {% url group.url_change_name as obj_change_url %}
+                                These records will not be anonymised, they can be exported or if you wish to delete them
+                                please do so via their <a href="{{ obj_change_url }}">admin page</a>.
+                            </td>
+                        </tr>
+                    {% endif %}
+                    {% for obj in group.results %}
+                        <tr class="row1">
+                            <td class="action-checkbox">
+                                <input name="obj_pk" value="{{ group.content_type.pk }}-{{ obj.pk }}"
+                                       class="action-select" type="checkbox">
+                            </td>
+                            <td class="field-username">
+                                {% url group.url_name obj.pk as obj_url %}
+                                {% if obj_url %}<a href="{{ obj_url }}">{% endif %}{{ obj }}{% if obj_url %}
+                                </a>{% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+
+                    {% if forloop.last %}
+                        </tbody>
+                        </table>
+                    {% endif %}
+                        {% empty %}
+                        <p>No results found.</p>
+                    {% endfor %}
+
+                </form>
+            </div>
+        </div>
     </div>
-</div>
 
 {% endblock %}
 

From f025a0a2f98db6ae38771297bac1012127383906 Mon Sep 17 00:00:00 2001
From: James Outterside <james.outterside@gmail.com>
Date: Thu, 28 Apr 2022 15:18:12 +0100
Subject: [PATCH 2/2] Fix format for test

---
 .../gdpr_assist/admin/pd_change_list.html     | 166 +++++++++---------
 1 file changed, 81 insertions(+), 85 deletions(-)

diff --git a/gdpr_assist/templates/gdpr_assist/admin/pd_change_list.html b/gdpr_assist/templates/gdpr_assist/admin/pd_change_list.html
index 7fa1e3d..268953a 100644
--- a/gdpr_assist/templates/gdpr_assist/admin/pd_change_list.html
+++ b/gdpr_assist/templates/gdpr_assist/admin/pd_change_list.html
@@ -2,82 +2,80 @@
 {% load i18n static %}
 
 {% block extrastyle %}
-    {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}"/>
-    {% if cl.formset %}
-        <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}"/>
-    {% endif %}
-    {% if cl.formset or action_form %}
-        <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
-    {% endif %}
-    {{ media.css }}
-
-    <style>
-        #changelist table td:first-child {
-            width: 1.5em;
-        }
-
-        #changelist table td.group-head {
-            padding: 1em 0 0 0;
-        }
-    </style>
+  {{ block.super }}
+  <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
+  {% if cl.formset %}
+    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
+  {% endif %}
+  {% if cl.formset or action_form %}
+    <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
+  {% endif %}
+  {{ media.css }}
+
+  <style>
+    #changelist table td:first-child {
+        width: 1.5em;
+    }
+    #changelist table td.group-head {
+        padding: 1em 0 0 0;
+    }
+  </style>
 {% endblock %}
 
 {% block extrahead %}
-    {{ block.super }}
-    {{ media.js }}
+{{ block.super }}
+{{ media.js }}
 {% endblock %}
 
 {% block breadcrumbs %}
-    <div class="breadcrumbs">
-        <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
-        &rsaquo; GDPR
-        &rsaquo; Personal Data
-    </div>
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+&rsaquo; GDPR
+&rsaquo; Personal Data
+</div>
 {% endblock %}
 
 {% block content %}
-    <div id="content-main">
-        <div id="changelist" class="module filtered">
-            <div class="changelist-form-container">
-                <div id="toolbar">
-                    <div class="search">
-                        <form action="." method="POST">
-                            {% csrf_token %}
-                            {{ form.term }}
-                            <input type="submit" value="Search">
-                        </form>
-                    </div>
+<div id="content-main">
+    <div id="changelist" class="module filtered">
+        <div class="changelist-form-container">
+            <div id="toolbar">
+                <div class="search">
+                    <form action="." method="POST">
+                        {% csrf_token %}
+                        {{ form.term }}
+                        <input type="submit" value="Search">
+                    </form>
                 </div>
+            </div>
 
-                <form action="." method="POST">
-                    {% csrf_token %}
-                    <input type="hidden" name="{{ form.term.name }}" value="{{ form.term.value }}">
-
-                    {% for group in results %}
-                        {% if forloop.first %}
-                            <div class="actions">
-                                <label>{{ form.action.label }}{{ form.action }} {{ form.action.errors }}</label>
-                                <button type="submit" class="button"
-                                        title="{% trans "Run the selected action" %}">{% trans "Go" %}</button>
-                            </div>
-
-                            <table>
-                            <thead>
-                            <tr>
-                                <th scope="col" class="action-checkbox-column">
-                                    <div class="text"><span><input id="action-toggle" type="checkbox"></span></div>
-                                    <div class="clear"></div>
-                                </th>
-
-                                <th scope="col">
-                                    <div class="text">Select all</div>
-                                </th>
-                            </tr>
-                            </thead>
-
-                            <tbody>
-                        {% endif %}
+            <form action="." method="POST">
+                {% csrf_token %}
+                <input type="hidden" name="{{ form.term.name }}" value="{{ form.term.value }}">
+
+        {% for group in results %}
+            {% if forloop.first %}
+            <div class="actions">
+                <label>{{ form.action.label }}{{ form.action }} {{ form.action.errors }}</label>
+                <button type="submit" class="button" title="{% trans "Run the selected action" %}">{% trans "Go" %}</button>
+            </div>
+
+            <table>
+                <thead>
+                    <tr>
+                        <th scope="col" class="action-checkbox-column">
+                           <div class="text"><span><input id="action-toggle" type="checkbox"></span></div>
+                           <div class="clear"></div>
+                        </th>
+
+                        <th scope="col">
+                            <div class="text">Select all</div>
+                        </th>
+                    </tr>
+                </thead>
+
+                <tbody>
+            {% endif %}
 
                     <tr>
                         <td colspan="2" class="group-head">
@@ -95,31 +93,29 @@ <h2>{{ group.app_label.title }}: {{ group.model_name.title }}</h2>
                         </tr>
                     {% endif %}
                     {% for obj in group.results %}
-                        <tr class="row1">
-                            <td class="action-checkbox">
-                                <input name="obj_pk" value="{{ group.content_type.pk }}-{{ obj.pk }}"
-                                       class="action-select" type="checkbox">
-                            </td>
-                            <td class="field-username">
-                                {% url group.url_name obj.pk as obj_url %}
-                                {% if obj_url %}<a href="{{ obj_url }}">{% endif %}{{ obj }}{% if obj_url %}
-                                </a>{% endif %}
-                            </td>
-                        </tr>
+                    <tr class="row1">
+                        <td class="action-checkbox">
+                            <input name="obj_pk" value="{{ group.content_type.pk }}-{{ obj.pk }}" class="action-select" type="checkbox">
+                        </td>
+                        <td class="field-username">
+                            {% url group.url_name obj.pk as obj_url %}
+                            {% if obj_url %}<a href="{{ obj_url }}">{% endif %}{{ obj }}{% if obj_url %}</a>{% endif %}
+                        </td>
+                    </tr>
                     {% endfor %}
 
-                    {% if forloop.last %}
-                        </tbody>
-                        </table>
-                    {% endif %}
-                        {% empty %}
-                        <p>No results found.</p>
-                    {% endfor %}
+            {% if forloop.last %}
+                </tbody>
+            </table>
+            {% endif %}
+        {% empty %}
+            <p>No results found.</p>
+        {% endfor %}
 
-                </form>
-            </div>
+        </form>
         </div>
     </div>
+</div>
 
 {% endblock %}