From 964f94da850596d17c63f4d2311e8a0cff6a2ed3 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Fri, 30 Dec 2022 19:29:31 -0600 Subject: [PATCH 1/2] Version Bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5213320..baa6ebd 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='netbox-secretstore', - version='1.4.0', + version='1.4.1', description='Netbox Secret Store', long_description='A Secret store for NetBox', url='https://github.com/dansheps/netbox-secretstore/', From 1d9bc691bb534b42cd4d25b08f5e3bb984e7a64f Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Fri, 30 Dec 2022 19:44:00 -0600 Subject: [PATCH 2/2] Fixes #97 - Corrects import template name --- .../templates/netbox_secretstore/secret_import.html | 2 +- netbox_secretstore/views.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox_secretstore/templates/netbox_secretstore/secret_import.html b/netbox_secretstore/templates/netbox_secretstore/secret_import.html index 4bf8a8d..fa78997 100644 --- a/netbox_secretstore/templates/netbox_secretstore/secret_import.html +++ b/netbox_secretstore/templates/netbox_secretstore/secret_import.html @@ -1,4 +1,4 @@ -{% extends 'generic/object_bulk_import.html' %} +{% extends 'generic/bulk_import.html' %} {% load static %} {% block content %} diff --git a/netbox_secretstore/views.py b/netbox_secretstore/views.py index 0069fd6..94debc4 100644 --- a/netbox_secretstore/views.py +++ b/netbox_secretstore/views.py @@ -72,7 +72,7 @@ class SecretRoleDeleteView(ObjectDeleteView): class SecretRoleBulkImportView(BulkImportView): queryset = SecretRole.objects.all() - form = SecretRoleCSVForm + model_form = SecretRoleCSVForm table = SecretRoleTable @@ -183,7 +183,7 @@ class SecretDeleteView(ObjectDeleteView): class SecretBulkImportView(BulkImportView): queryset = Secret.objects.all() - form = SecretCSVForm + model_form = SecretCSVForm table = SecretTable template_name = 'netbox_secretstore/secret_import.html' widget_attrs = {'class': 'requires-session-key'}