NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixes: #18369 - Remove the json filter for protection rules (#18388)

Browse Source 
* Remove the json filter for protection rules

* Configure PROTECTION_RULE config attribute to use ConfigJSONEncoder as serializer

* Tweak getattr()

---------

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
This commit is contained in:
atownson 2025-01-17 13:02:12 -06:00 committed by GitHub
parent 5b9210dfa5
commit 2ed4a2b005
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/core/views.py
View File

@ -570,8 +570,9 @@ class SystemView(UserPassesTestMixin, View):
return response return response
# Serialize any CustomValidator classes # Serialize any CustomValidator classes
if hasattr(config, 'CUSTOM_VALIDATORS') and config.CUSTOM_VALIDATORS: for attr in ['CUSTOM_VALIDATORS', 'PROTECTION_RULES']:
config.CUSTOM_VALIDATORS = json.dumps(config.CUSTOM_VALIDATORS, cls=ConfigJSONEncoder, indent=4) if hasattr(config, attr) and getattr(config, attr, None):
setattr(config, attr, json.dumps(getattr(config, attr), cls=ConfigJSONEncoder, indent=4))
return render(request, 'core/system.html', { return render(request, 'core/system.html', {
'stats': stats, 'stats': stats,

2
netbox/templates/core/inc/config_data.html
View File

@ -103,7 +103,7 @@
<tr> <tr>
<th scope="row" class="border-0 ps-3">{% trans "Protection rules" %}</th> <th scope="row" class="border-0 ps-3">{% trans "Protection rules" %}</th>
{% if config.PROTECTION_RULES %} {% if config.PROTECTION_RULES %}
<td class="border-0"><pre>{{ config.PROTECTION_RULES|json }}</pre></td> <td class="border-0"><pre>{{ config.PROTECTION_RULES }}</pre></td>
{% else %} {% else %}
<td class="border-0">{{ ''|placeholder }}</td> <td class="border-0">{{ ''|placeholder }}</td>
{% endif %} {% endif %}