Merge pull request #867 from cisagov/rjm/839-django-admin-staff-column-missing

839 - Fix missing column in django admin for Staff users
This commit is contained in:
rachidatecs 2023-08-14 10:56:17 -04:00 committed by GitHub
commit 798f021e98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -17,6 +17,7 @@ Load our custom filters to extract info from the django generated markup.
<thead> <thead>
<tr> <tr>
{% if results.0.form %}
{# .gov - hardcode the select all checkbox #} {# .gov - hardcode the select all checkbox #}
<th scope="col" class="action-checkbox-column" title="Toggle all"> <th scope="col" class="action-checkbox-column" title="Toggle all">
<div class="text"> <div class="text">
@ -29,7 +30,6 @@ Load our custom filters to extract info from the django generated markup.
</th> </th>
{# .gov - don't let django generate the select all checkbox #} {# .gov - don't let django generate the select all checkbox #}
{% for header in result_headers|slice:"1:" %} {% for header in result_headers|slice:"1:" %}
<th scope="col"{{ header.class_attrib }}> <th scope="col"{{ header.class_attrib }}>
{% if header.sortable %} {% if header.sortable %}
{% if header.sort_priority > 0 %} {% if header.sort_priority > 0 %}
@ -48,21 +48,13 @@ Load our custom filters to extract info from the django generated markup.
</thead> </thead>
<tbody> <tbody>
{% 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 %} {% comment %}
.gov - hardcode the row checkboxes using the custom filters to extract .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 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 text. Then edit the for loop to keep django from generating the row select
checkboxes. checkboxes.
{% endcomment %} {% endcomment %}
{% for result in results %} {% for result in results %}
{% if result.form.non_field_errors %} {% if result.form.non_field_errors %}
<tr><td colspan="{{ result|length }}">{{ result.form.non_field_errors }}</td></tr> <tr><td colspan="{{ result|length }}">{{ result.form.non_field_errors }}</td></tr>
@ -84,6 +76,36 @@ checkboxes.
</tr> </tr>
{% endfor %} {% endfor %}
{% else %} {# results doesn't have a form as its first element #}
{% 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> </tbody>
</table> </table>
</div> </div>