NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-19 17:59:11 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixes #8527: Fix display of changelog retention period

Browse Source
This commit is contained in:
jeremystretch 2022-02-03 09:48:21 -05:00
parent db3f478598
commit ff3b48fa59
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.1.md
View File

@ -23,6 +23,7 @@
* [#8498](https://github.com/netbox-community/netbox/issues/8498) - Fix display of selected content type filters in object list views * [#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 * [#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 * [#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
--- ---

2
netbox/templates/extras/object_changelog.html
View File

@ -11,7 +11,7 @@
</div> </div>
</div> </div>
<div class="text-muted"> <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> </div>
</div> </div>

9
netbox/templates/extras/objectchange_list.html
View File

@ -2,8 +2,9 @@
{% block title %}Change Log{% endblock %} {% block title %}Change Log{% endblock %}
{% block sidebar %} {% block content-wrapper %}
<div class="text-muted"> {{ block.super }}
Change log retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %} <div class="text-muted px-3">
</div> Change log retention: {% if config.CHANGELOG_RETENTION %}{{ config.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
</div>
{% endblock %} {% endblock %}