Some more fixes

DanSheps · Nov 21, 2021 · cdcc6ef · cdcc6ef
1 parent d7dbe20
commit cdcc6ef
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 35 deletions.
diff --git a/netbox_secretstore/template_content.py b/netbox_secretstore/template_content.py
@@ -10,13 +10,15 @@ def right_page(self):
         obj = self.context['object']
 
         secrets = None
-        if ContentType.objects.get_for_model(obj).name == 'device':
-            secrets = Secret.objects.filter(device=obj)
-        elif ContentType.objects.get_for_model(obj).name == 'virtualmachine':
-            secrets = Secret.objects.filter(virtualmachine=obj)
+        ctype = ContentType.objects.get_for_model(obj)
+        if ctype.model == 'device':
+            secrets = Secret.objects.filter(assigned_object_id=obj.pk, assigned_object_type=ctype)
+        elif ctype.model == 'virtualmachine':
+            secrets = Secret.objects.filter(assigned_object_id=obj.pk, assigned_object_type=ctype)
 
         return self.render('netbox_secretstore/inc/device_secrets.html', extra_context={
             'secrets': secrets,
+            'type': ctype.model if ctype.model == 'device' else ctype.name.replace(' ', '_'),
         })
 
 

diff --git a/netbox_secretstore/templates/netbox_secretstore/inc/device_secrets.html b/netbox_secretstore/templates/netbox_secretstore/inc/device_secrets.html
@@ -8,7 +8,7 @@ <h5 class="card-header">
         </div>
         {% if perms.netbox_secretstore.add_secret %}
         <div class="card-footer text-end noprint">
-            <a href="{% url 'plugins:netbox_secretstore:secret_add' %}?device={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+            <a href="{% url 'plugins:netbox_secretstore:secret_add' %}?{{ type }}={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
                 <i class="mdi mdi-plus-thick"></i> Add Secret
             </a>
         </div>

diff --git a/netbox_secretstore/templates/netbox_secretstore/secret_edit.html b/netbox_secretstore/templates/netbox_secretstore/secret_edit.html
@@ -10,36 +10,36 @@
 {{ form.private_key }}
 <div class="field-group">
     <h4>Secret Assignment</h4>
-    <ul class="nav nav-tabs" role="tablist">
-        <li class="nav-item" role="presentation">
-            <button
-                role="tab"
-                type="button"
-                id="device_tab"
-                data-bs-toggle="tab"
-                class="nav-link{% if not vm_tab_active %} active{% endif %}"
-                data-bs-target="#device"
-                aria-controls="device"
-            >
-                Device
-            </button>
-        </li>
-        <li class="nav-item" role="presentation">
-            <button
-                role="tab"
-                type="button"
-                id="vm_tab"
-                data-bs-toggle="tab"
-                class="nav-link{% if vm_tab_active %} active{% endif %}"
-                data-bs-target="#virtualmachine"
-                aria-controls="virtualmachine"
-            >
-                Virtual Machine
-            </button>
-        </li>
-    </ul>
-    <div class="tab-content">
     {% with vm_tab_active=form.initial.virtual_machine %}
+        <ul class="nav nav-tabs" role="tablist">
+            <li class="nav-item" role="presentation">
+                <button
+                    role="tab"
+                    type="button"
+                    id="device_tab"
+                    data-bs-toggle="tab"
+                    class="nav-link{% if not vm_tab_active %} active{% endif %}"
+                    data-bs-target="#device"
+                    aria-controls="device"
+                >
+                    Device
+                </button>
+            </li>
+            <li class="nav-item" role="presentation">
+                <button
+                    role="tab"
+                    type="button"
+                    id="vm_tab"
+                    data-bs-toggle="tab"
+                    class="nav-link{% if vm_tab_active %} active{% endif %}"
+                    data-bs-target="#virtualmachine"
+                    aria-controls="virtualmachine"
+                >
+                    Virtual Machine
+                </button>
+            </li>
+        </ul>
+        <div class="tab-content">
             <div class="tab-pane{% if not vm_tab_active %} active{% endif %}" id="device">
                 {% render_field form.device %}
             </div>

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='netbox-secretstore',
-    version='1.0.9',
+    version='1.0.10',
     description='Netbox Secret Store',
     long_description='A Secret store for NetBox',
     url='https://github.com/dansheps/netbox-secretstore/',