From dfcd2c247d6da8f85cb1aec02d178a0646b63b5b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 20 Jun 2019 14:05:53 -0400 Subject: [PATCH] Closes #3264: Annotate changelog retention time on UI --- CHANGELOG.md | 1 + netbox/templates/extras/object_changelog.html | 5 +++++ netbox/templates/extras/objectchange_list.html | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4a627c5a..26b57caec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -177,6 +177,7 @@ scheme. This change was introuced in django-cors-headers 3.0. * [#2920](https://github.com/digitalocean/netbox/issues/2920) - Rename Interface `form_factor` to `type` (backward-compatible until v2.7) * [#2926](https://github.com/digitalocean/netbox/issues/2926) - Add change logging to the Tag model * [#3038](https://github.com/digitalocean/netbox/issues/3038) - OR logic now used when multiple values of a query filter are passed +* [#3264](https://github.com/digitalocean/netbox/issues/3264) - Annotate changelog retention time on UI ## Bug Fixes diff --git a/netbox/templates/extras/object_changelog.html b/netbox/templates/extras/object_changelog.html index ac79be2a6..857b56e7c 100644 --- a/netbox/templates/extras/object_changelog.html +++ b/netbox/templates/extras/object_changelog.html @@ -5,4 +5,9 @@ {% block content %} {% if obj %}

{{ obj }}

{% endif %} {% include 'panel_table.html' with table=objectchanges_table %} + {% if settings.CHANGELOG_RETENTION %} +
+ Changelog retention: {{ settings.CHANGELOG_RETENTION }} days +
+ {% endif %} {% endblock %} diff --git a/netbox/templates/extras/objectchange_list.html b/netbox/templates/extras/objectchange_list.html index ec309e2a6..77b66f6b6 100644 --- a/netbox/templates/extras/objectchange_list.html +++ b/netbox/templates/extras/objectchange_list.html @@ -9,6 +9,11 @@
{% include 'utilities/obj_table.html' %} + {% if settings.CHANGELOG_RETENTION %} +
+ Changelog retention: {{ settings.CHANGELOG_RETENTION }} days +
+ {% endif %}
{% include 'inc/search_panel.html' %}