Merge pull request #64 from DanSheps/develop

Bunch of 3.5 fixes
DanSheps · May 9, 2023 · db6c9be · db6c9be
2 parents ceae672 + a6b2e63
commit db6c9be
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 60 deletions.
diff --git a/netbox_config_backup/templates/netbox_config_backup/backup.html b/netbox_config_backup/templates/netbox_config_backup/backup.html
@@ -1,4 +1,4 @@
-{% extends 'netbox_config_backup/base.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 
 {% block subtitle %}

diff --git a/netbox_config_backup/templates/netbox_config_backup/backups.html b/netbox_config_backup/templates/netbox_config_backup/backups.html
@@ -1,4 +1,4 @@
-{% extends 'netbox_config_backup/base.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 
 {% block subtitle %}

diff --git a/netbox_config_backup/templates/netbox_config_backup/base.html b/netbox_config_backup/templates/netbox_config_backup/base.html
diff --git a/netbox_config_backup/templates/netbox_config_backup/config.html b/netbox_config_backup/templates/netbox_config_backup/config.html
@@ -1,4 +1,4 @@
-{% extends 'netbox_config_backup/base.html' %}
+{% extends 'generic/object.html' %}
 
 {% block content %}
 <div class="row">

diff --git a/netbox_config_backup/templates/netbox_config_backup/diff.html b/netbox_config_backup/templates/netbox_config_backup/diff.html
@@ -1,4 +1,4 @@
-{% extends 'netbox_config_backup/base.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 
 {% block subtitle %}

diff --git a/...x_config_backup/templates/netbox_config_backup/switch_templates/cisco_iosxe/interface.tpl b/...x_config_backup/templates/netbox_config_backup/switch_templates/cisco_iosxe/interface.tpl
diff --git a/netbox_config_backup/views.py b/netbox_config_backup/views.py
@@ -162,6 +162,7 @@ def get(self, request, pk, current=None):
 
         return render(request, 'netbox_config_backup/config.html', {
             'object': backup,
+            'tab': self.tab,
             'backup_config': config,
             'current': current,
             'previous': previous,
@@ -177,7 +178,7 @@ class DiffView(ObjectView):
         label='Diff',
     )
 
-    def get(self, request, pk, current, previous=None):
+    def get(self, request, pk, current=None, previous=None):
         backup = get_object_or_404(Backup.objects.all(), pk=pk)
         if current:
             current = get_object_or_404(BackupCommitTreeChange.objects.all(), pk=current)
@@ -223,6 +224,7 @@ def get(self, request, pk, current, previous=None):
 
         return render(request, 'netbox_config_backup/diff.html', {
             'object': backup,
+            'tab': self.tab,
             'diff': diff,
             'current': current,
             'previous': previous,

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='netbox_config_backup',
-    version='1.4.2',
+    version='1.4.3',
     description='NetBox Configuration Backup',
     long_description='Plugin to backup device configuration',
     url='https://github.com/dansheps/netbox-config-backup/',