From c9863214022d50e0431867d2c323c10e5733082b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 21 Sep 2020 10:54:04 -0400 Subject: [PATCH] Fix "add secret" link for VMs --- netbox/templates/dcim/device.html | 14 +++- .../secrets/inc/assigned_secrets.html | 65 +++++++------------ .../virtualization/virtualmachine.html | 14 +++- 3 files changed, 51 insertions(+), 42 deletions(-) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 6f8ae69c6..2918d2fe3 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -396,7 +396,19 @@ {% endif %} {% if perms.secrets.view_secret %} - {% include 'secrets/inc/assigned_secrets.html' %} +
+
+ Secrets +
+ {% include 'secrets/inc/assigned_secrets.html' %} + {% if perms.secrets.add_secret %} + + {% endif %} +
{% endif %}
diff --git a/netbox/templates/secrets/inc/assigned_secrets.html b/netbox/templates/secrets/inc/assigned_secrets.html index 11ad5e75d..2da526a5c 100644 --- a/netbox/templates/secrets/inc/assigned_secrets.html +++ b/netbox/templates/secrets/inc/assigned_secrets.html @@ -1,41 +1,26 @@ -
-
- Secrets +{% if secrets %} + + {% for secret in secrets %} + + + + + + + {% endfor %} +
{{ secret.role }}{{ secret.name }}******** + + + +
+{% else %} +
+ None found
- {% if secrets %} - - {% for secret in secrets %} - - - - - - - {% endfor %} -
{{ secret.role }}{{ secret.name }}******** - - - -
- {% else %} -
- None found -
- {% endif %} - {% if perms.secrets.add_secret %} -
- {% csrf_token %} -
- - {% endif %} -
+{% endif %} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 3f0a37b88..7eabcf504 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -221,7 +221,19 @@
{% if perms.secrets.view_secret %} - {% include 'secrets/inc/assigned_secrets.html' %} +
+
+ Secrets +
+ {% include 'secrets/inc/assigned_secrets.html' %} + {% if perms.secrets.add_secret %} + + {% endif %} +
{% endif %}