Просмотр исходного кода

Fixes #8527: Fix display of changelog retention period

jeremystretch 4 лет назад
Родитель
Сommit
ff3b48fa59

+ 1 - 0
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
 
 ---
 

+ 1 - 1
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>

+ 5 - 4
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 %}