* Update for 3.1

DanSheps · Dec 9, 2021 · a0260c8 · a0260c8
1 parent cdcc6ef
commit a0260c8
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 408 deletions.
diff --git a/netbox_secretstore/forms/secrets.py b/netbox_secretstore/forms/secrets.py
@@ -45,7 +45,7 @@ def validate_rsa_key(key, is_secret=True):
 # Secret roles
 #
 
-class SecretRoleForm(BootstrapMixin, CustomFieldModelForm):
+class SecretRoleForm(CustomFieldModelForm):
     slug = SlugField()
 
     class Meta:
@@ -61,7 +61,7 @@ class Meta:
         fields = SecretRole.csv_headers
 
 
-class SecretRoleBulkEditForm(BootstrapMixin, CustomFieldModelBulkEditForm):
+class SecretRoleBulkEditForm(CustomFieldModelBulkEditForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=SecretRole.objects.all(),
         widget=forms.MultipleHiddenInput
@@ -79,7 +79,7 @@ class Meta:
 # Secrets
 #
 
-class SecretForm(BootstrapMixin, CustomFieldModelForm):
+class SecretForm(CustomFieldModelForm):
     device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
         required=False
@@ -212,7 +212,7 @@ def save(self, *args, **kwargs):
         return s
 
 
-class SecretBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulkEditForm):
+class SecretBulkEditForm(AddRemoveTagsForm, CustomFieldModelBulkEditForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=Secret.objects.all(),
         widget=forms.MultipleHiddenInput()
@@ -232,7 +232,7 @@ class Meta:
         ]
 
 
-class SecretFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
+class SecretFilterForm(CustomFieldModelFilterForm):
     model = Secret
     q = forms.CharField(
         required=False,
@@ -250,7 +250,7 @@ class SecretFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
 # UserKeys
 #
 
-class UserKeyForm(BootstrapMixin, forms.ModelForm):
+class UserKeyForm(forms.ModelForm):
 
     class Meta:
         model = UserKey

diff --git a/netbox_secretstore/templates/netbox_secretstore/generic/object.html b/netbox_secretstore/templates/netbox_secretstore/generic/object.html
diff --git a/netbox_secretstore/templates/netbox_secretstore/generic/object_list.html b/netbox_secretstore/templates/netbox_secretstore/generic/object_list.html
diff --git a/netbox_secretstore/templates/netbox_secretstore/secret.html b/netbox_secretstore/templates/netbox_secretstore/secret.html
@@ -1,4 +1,4 @@
-{% extends 'netbox_secretstore/generic/object.html' %}
+{% extends 'netbox_plugin_extensions/generic/object.html' %}
 {% load buttons %}
 {% load helpers %}
 {% load static %}
@@ -39,7 +39,7 @@ <h5 class="card-header">
                 </table>
             </div>
         </div>
-        {% include 'inc/custom_fields_panel.html' %}
+        {% include 'inc/panels/custom_fields.html' %}
         {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
@@ -68,7 +68,7 @@ <h5 class="card-header">
                 </div>
             </div>
         </div>
-        {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='plugins:netbox_secretstore:secret_list' %}
+        {% include 'inc/panels/tags.html' with tags=object.tags.all url='plugins:netbox_secretstore:secret_list' %}
         {% plugin_right_page object %}
     </div>
 </div>

diff --git a/netbox_secretstore/templates/netbox_secretstore/secretrole.html b/netbox_secretstore/templates/netbox_secretstore/secretrole.html
@@ -1,4 +1,4 @@
-{% extends 'netbox_secretstore/generic/object.html' %}
+{% extends 'netbox_plugin_extensions/generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
@@ -8,57 +8,57 @@
 {% endblock %}
 
 {% block content %}
-<div class="row mb-3">
-	<div class="col col-md-6">
-    <div class="card">
-      <h5 class="card-header">
-        Secret Role
-      </h5>
-      <div class="card-body">
-        <table class="table table-hover attr-table">
-          <tr>
-            <th scope="row">Name</th>
-            <td>{{ object.name }}</td>
-          </tr>
-          <tr>
-            <th scope="row">Description</th>
-            <td>{{ object.description|placeholder }}</td>
-          </tr>
-          <tr>
-            <th scope="row">Secrets</th>
-            <td>
-              <a href="{% url 'plugins:netbox_secretstore:secret_list' %}?role_id={{ object.pk }}">{{ secrets_table.rows|length }}</a>
-            </td>
-          </tr>
-        </table>
+  <div class="row mb-3">
+      <div class="col col-md-6">
+      <div class="card">
+        <h5 class="card-header">
+          Secret Role
+        </h5>
+        <div class="card-body">
+          <table class="table table-hover attr-table">
+            <tr>
+              <th scope="row">Name</th>
+              <td>{{ object.name }}</td>
+            </tr>
+            <tr>
+              <th scope="row">Description</th>
+              <td>{{ object.description|placeholder }}</td>
+            </tr>
+            <tr>
+              <th scope="row">Secrets</th>
+              <td>
+                <a href="{% url 'plugins:netbox_secretstore:secret_list' %}?role_id={{ object.pk }}">{{ secrets_table.rows|length }}</a>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
+      {% plugin_left_page object %}
       </div>
+      <div class="col col-md-6">
+      {% include 'inc/panels/custom_fields.html' %}
+      {% plugin_right_page object %}
     </div>
-    {% plugin_left_page object %}
-	</div>
-	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
-    {% plugin_right_page object %}
   </div>
-</div>
-<div class="row">
-	<div class="col col-md-12">
-    <div class="card">
-      <h5 class="card-header">
-        Secrets
-      </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=secrets_table %}
-      </div>
-      {% if perms.netbox_secretstore.add_secret %}
-        <div class="card-footer text-end noprint">
-          <a href="{% url 'plugins:netbox_secretstore:secret_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
-            <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Secret
-          </a>
+  <div class="row">
+      <div class="col col-md-12">
+      <div class="card">
+        <h5 class="card-header">
+          Secrets
+        </h5>
+        <div class="card-body">
+          {% include 'inc/table.html' with table=secrets_table %}
         </div>
-      {% endif %}
+        {% if perms.netbox_secretstore.add_secret %}
+          <div class="card-footer text-end noprint">
+            <a href="{% url 'plugins:netbox_secretstore:secret_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+              <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Secret
+            </a>
+          </div>
+        {% endif %}
+      </div>
+      {% include 'inc/paginator.html' with paginator=secrets_table.paginator page=secrets_table.page %}
+      {% plugin_full_width_page object %}
     </div>
-    {% include 'inc/paginator.html' with paginator=secrets_table.paginator page=secrets_table.page %}
-    {% plugin_full_width_page object %}
   </div>
-</div>
 {% endblock %}
diff --git a/netbox_secretstore/templates/netbox_secretstore/userkey.html b/netbox_secretstore/templates/netbox_secretstore/userkey.html
@@ -1,4 +1,4 @@
-{% extends 'users/base.html' %}
+{% extends 'base/layout.html' %}
 
 {% block title %}User Key{% endblock %}
 

diff --git a/netbox_secretstore/templates/netbox_secretstore/userkey_edit.html b/netbox_secretstore/templates/netbox_secretstore/userkey_edit.html
@@ -1,10 +1,8 @@
-{% extends 'users/base.html' %}
+{% extends 'netbox_plugin_extensions/generic/object_edit.html' %}
 {% load form_helpers %}
 {% load plugins %}
 {% load static %}
 
-{% block title %}User Key{% endblock %}
-
 {% block content %}
     {% if object.is_active %}
         <div class="alert alert-danger" role="alert">

diff --git a/netbox_secretstore/templatetags/__init__.py b/netbox_secretstore/templatetags/__init__.py