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

Merge branch 'develop' into develop-2.8

Browse Source
This commit is contained in:
John Anderson
2020-03-15 00:18:32 -04:00
parent 36130965f2 9466802a95
commit 9df238c5f2
36 changed files with 464 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/utilities/api.py
View File

@@ -235,6 +235,7 @@ class ValidatedModelSerializer(ModelSerializer):
for k, v in attrs.items():
setattr(instance, k, v)
instance.clean()
instance.validate_unique()
return data

4
netbox/utilities/templatetags/helpers.py
View File

@@ -40,7 +40,7 @@ def render_markdown(value):
value = strip_tags(value)
# Render Markdown
html = markdown(value, extensions=['fenced_code'])
html = markdown(value, extensions=['fenced_code', 'tables'])
return mark_safe(html)
@@ -196,7 +196,7 @@ def get_docs(model):
return "Unable to load documentation, error reading file: {}".format(path)
# Render Markdown with the admonition extension
content = markdown(content, extensions=['admonition', 'fenced_code'])
content = markdown(content, extensions=['admonition', 'fenced_code', 'tables'])
return mark_safe(content)