From ff3b48fa59ad2a578f6b65f623e28040547d0036 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Thu, 3 Feb 2022 09:48:21 -0500
Subject: [PATCH] Fixes #8527: Fix display of changelog retention period

---
 docs/release-notes/version-3.1.md              | 1 +
 netbox/templates/extras/object_changelog.html  | 2 +-
 netbox/templates/extras/objectchange_list.html | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md
index ce50026b8..46497bb03 100644
--- a/docs/release-notes/version-3.1.md
+++ b/docs/release-notes/version-3.1.md
@@ -23,6 +23,7 @@
 * [#8498](https://github.com/netbox-community/netbox/issues/8498) - Fix display of selected content type filters in object list views
 * [#8499](https://github.com/netbox-community/netbox/issues/8499) - Content types REST API endpoint should not require model permission
 * [#8512](https://github.com/netbox-community/netbox/issues/8512) - Correct file permissions to allow execution of housekeeping script
+* [#8527](https://github.com/netbox-community/netbox/issues/8527) - Fix display of changelog retention period
 
 ---
 
diff --git a/netbox/templates/extras/object_changelog.html b/netbox/templates/extras/object_changelog.html
index d84ba0b7a..d064ab435 100644
--- a/netbox/templates/extras/object_changelog.html
+++ b/netbox/templates/extras/object_changelog.html
@@ -11,7 +11,7 @@
         </div>
       </div>
       <div class="text-muted">
-        Change log retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
+        Change log retention: {% if config.CHANGELOG_RETENTION %}{{ config.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
       </div>
     </div>
   </div>
diff --git a/netbox/templates/extras/objectchange_list.html b/netbox/templates/extras/objectchange_list.html
index efcac976d..4f4905e6e 100644
--- a/netbox/templates/extras/objectchange_list.html
+++ b/netbox/templates/extras/objectchange_list.html
@@ -2,8 +2,9 @@
 
 {% block title %}Change Log{% endblock %}
 
-{% block sidebar %}
-    <div class="text-muted">
-        Change log retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
-    </div>
+{% block content-wrapper %}
+  {{ block.super }}
+  <div class="text-muted px-3">
+    Change log retention: {% if config.CHANGELOG_RETENTION %}{{ config.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
+  </div>
 {% endblock %}