Convert change log view to extend standard template

This commit is contained in:
Jeremy Stretch 2020-02-13 17:11:39 -05:00
parent ff952fb221
commit 8df9bb6fb4
4 changed files with 16 additions and 30 deletions

View File

@ -190,8 +190,8 @@ class ObjectChangeListView(PermissionRequiredMixin, ObjectListView):
filterset = filters.ObjectChangeFilterSet filterset = filters.ObjectChangeFilterSet
filterset_form = forms.ObjectChangeFilterForm filterset_form = forms.ObjectChangeFilterForm
table = ObjectChangeTable table = ObjectChangeTable
# TODO: Remove custom template
template_name = 'extras/objectchange_list.html' template_name = 'extras/objectchange_list.html'
action_buttons = ('export',)
class ObjectChangeView(PermissionRequiredMixin, View): class ObjectChangeView(PermissionRequiredMixin, View):

View File

@ -1,20 +1,9 @@
{% extends '_base.html' %} {% extends 'utilities/obj_list.html' %}
{% load buttons %}
{% block content %} {% block title %}Change Log{% endblock %}
<div class="pull-right noprint">
{% export_button content_type %} {% block sidebar %}
</div> <div class="text-muted">
<h1>{% block title %}Changelog{% endblock %}</h1> Change log retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
<div class="row">
<div class="col-md-9">
{% include 'utilities/obj_table.html' %}
<div class="text-muted text-right">
Changelog retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
</div>
</div> </div>
<div class="col-md-3 noprint">
{% include 'inc/search_panel.html' %}
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -473,7 +473,7 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="dropdown-header">Logging</li> <li class="dropdown-header">Logging</li>
<li{% if not perms.extras.view_objectchange %} class="disabled"{% endif %}> <li{% if not perms.extras.view_objectchange %} class="disabled"{% endif %}>
<a href="{% url 'extras:objectchange_list' %}">Changelog</a> <a href="{% url 'extras:objectchange_list' %}">Change Log</a>
</li> </li>
<li class="divider"></li> <li class="divider"></li>
<li class="dropdown-header">Miscellaneous</li> <li class="dropdown-header">Miscellaneous</li>

View File

@ -16,17 +16,14 @@
</div> </div>
<h1>{% block title %}{{ content_type.model_class|model_name_plural|bettertitle }}{% endblock %}</h1> <h1>{% block title %}{{ content_type.model_class|model_name_plural|bettertitle }}{% endblock %}</h1>
<div class="row"> <div class="row">
{% if filter_form %} <div class="col-md-9">
<div class="col-md-9"> {% include 'utilities/obj_table.html' with bulk_edit_url=content_type.model_class|url_name:"bulk_edit" bulk_delete_url=content_type.model_class|url_name:"bulk_delete" %}
{% include 'utilities/obj_table.html' with bulk_edit_url=content_type.model_class|url_name:"bulk_edit" bulk_delete_url=content_type.model_class|url_name:"bulk_delete" %} </div>
</div> <div class="col-md-3 noprint">
<div class="col-md-3 noprint"> {% if filter_form %}
{% include 'inc/search_panel.html' %} {% include 'inc/search_panel.html' %}
</div> {% endif %}
{% else %} {% block sidebar %}{% endblock %}
<div class="col-md-12"> </div>
{% include 'utilities/obj_table.html' with bulk_edit_url=content_type.model_class|url_name:"bulk_edit" bulk_delete_url=content_type.model_class|url_name:"bulk_delete" %}
</div>
{% endif %}
</div> </div>
{% endblock %} {% endblock %}