From 3ec0fe5519cbd174b91a0916b459c5615cb04d74 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 28 Sep 2021 13:23:57 -0400 Subject: [PATCH] Closes #7372: Link to local docs for model from object add/edit views --- docs/release-notes/version-3.0.md | 1 + netbox/templates/generic/object_edit.html | 12 +++--------- netbox/templates/inc/modal.html | 15 --------------- netbox/utilities/templatetags/helpers.py | 22 +++------------------- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 netbox/templates/inc/modal.html diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 796f9562f..55fc78bb0 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -7,6 +7,7 @@ * [#6917](https://github.com/netbox-community/netbox/issues/6917) - Make ip assigned checkmark in ip table link to interface * [#7118](https://github.com/netbox-community/netbox/issues/7118) - Render URL custom fields as hyperlinks in object tables * [#7323](https://github.com/netbox-community/netbox/issues/7323) - Add serial filter field for racks & devices +* [#7372](https://github.com/netbox-community/netbox/issues/7372) - Link to local docs for model from object add/edit views ### Bug Fixes diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html index 7ee4c4f94..bd3f6059b 100644 --- a/netbox/templates/generic/object_edit.html +++ b/netbox/templates/generic/object_edit.html @@ -7,12 +7,12 @@ {% endblock title %} {% block controls %} - {% if settings.DOCS_ROOT %} + {% if obj and settings.DOCS_ROOT %}
{% endif %} @@ -84,7 +84,6 @@
{% block buttons %} Cancel - {% if obj.pk %} {% endif %} - {% endblock buttons %}
- {% if obj and settings.DOCS_ROOT %} - {% include 'inc/modal.html' with name='docs' content=obj|get_docs %} - {% endif %} - {% endblock content-wrapper %} diff --git a/netbox/templates/inc/modal.html b/netbox/templates/inc/modal.html deleted file mode 100644 index 054e94541..000000000 --- a/netbox/templates/inc/modal.html +++ /dev/null @@ -1,15 +0,0 @@ - diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 615595f0f..532eea19b 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -216,27 +216,11 @@ def percentage(x, y): @register.filter() -def get_docs(model): +def get_docs_url(model): """ - Render and return documentation for the specified model. + Return the documentation URL for the specified model. """ - path = '{}/models/{}/{}.md'.format( - settings.DOCS_ROOT, - model._meta.app_label, - model._meta.model_name - ) - try: - with open(path, encoding='utf-8') as docfile: - content = docfile.read() - except FileNotFoundError: - return "Unable to load documentation, file not found: {}".format(path) - except IOError: - return "Unable to load documentation, error reading file: {}".format(path) - - # Render Markdown with the admonition extension - content = markdown(content, extensions=['admonition', 'fenced_code', 'tables']) - - return mark_safe(content) + return f'{settings.STATIC_URL}docs/models/{model._meta.app_label}/{model._meta.model_name}/' @register.filter()