Skip to content

Commit e950c72

Browse files
committed
Cont working on support for Netbox 2.10
1 parent bb7d294 commit e950c72

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
# under development/netbox_<NETBOX_VER>/configuration.py
1010
matrix:
1111
- NETBOX_VER=v2.8.9
12-
- NETBOX_VER=v2.9.9
12+
- NETBOX_VER=v2.9.11
1313
- NETBOX_VER=v2.10.1
1414
# Encrypted value for PYPI_TOKEN, this secret has been generated with the following command
1515
# travis encrypt PYPI_TOKEN=<value> --add env.global --com
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
{% extends 'utilities/obj_edit.html' %}
1+
{% if "2.8." in settings.VERSION or "2.9." in settings.VERSION %}
2+
{% include 'utilities/obj_edit.html' %}
3+
{% else %}
4+
{% include 'generic/object_edit.html' %}
5+
{% endif %}
26
{% load form_helpers %}

netbox_onboarding/views.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414
import logging
1515

1616
from django.shortcuts import get_object_or_404, render
17-
from django.views.generic import View
1817

19-
from .release import NETBOX_RELEASE_CURRENT, NETBOX_RELEASE_29, NETBOX_RELEASE_210
2018

19+
from .release import NETBOX_RELEASE_CURRENT, NETBOX_RELEASE_29, NETBOX_RELEASE_210
2120
from .filters import OnboardingTaskFilter
2221
from .forms import OnboardingTaskForm, OnboardingTaskFilterForm, OnboardingTaskFeedCSVForm
2322
from .models import OnboardingTask
2423
from .tables import OnboardingTaskTable, OnboardingTaskFeedBulkTable
2524

2625
logger = logging.getLogger("rq.worker")
2726

28-
# pylint: disable=ungrouped-imports
27+
# pylint: disable=ungrouped-imports,no-name-in-module
2928

3029
if NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_29:
3130
from django.contrib.auth.mixins import PermissionRequiredMixin
31+
from django.views.generic import View
3232
from utilities.views import BulkDeleteView, BulkImportView, ObjectEditView, ObjectListView
3333

3434
class ReleaseMixinOnboardingTaskView(PermissionRequiredMixin, View):
@@ -57,9 +57,8 @@ class ReleaseMixinOnboardingTaskFeedBulkImportView(PermissionRequiredMixin, Bulk
5757
permission_required = "netbox_onboarding.add_onboardingtask"
5858

5959

60-
elif NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_29 and NETBOX_RELEASE_CURRENT > NETBOX_RELEASE_210:
61-
from utilities.views import ObjectView # pylint: disable=no-name-in-module
62-
from utilities.views import BulkDeleteView, BulkImportView, ObjectEditView, ObjectListView
60+
elif NETBOX_RELEASE_29 < NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_210:
61+
from utilities.views import ObjectView, BulkDeleteView, BulkImportView, ObjectEditView, ObjectListView
6362

6463
class ReleaseMixinOnboardingTaskView(ObjectView):
6564
"""Release Mixin View for presenting a single OnboardingTask."""
@@ -78,21 +77,23 @@ class ReleaseMixinOnboardingTaskFeedBulkImportView(BulkImportView):
7877

7978

8079
else:
81-
from netbox.views.generic import ObjectView, BulkDeleteView, BulkImportView, ObjectEditView, ObjectListView
80+
from netbox.views import generic
8281

83-
class ReleaseMixinOnboardingTaskView(ObjectView):
82+
# ObjectView, BulkDeleteView, BulkImportView, ObjectEditView, ObjectListView
83+
84+
class ReleaseMixinOnboardingTaskView(generic.ObjectView):
8485
"""Release Mixin View for presenting a single OnboardingTask."""
8586

86-
class ReleaseMixinOnboardingTaskListView(ObjectListView):
87+
class ReleaseMixinOnboardingTaskListView(generic.ObjectListView):
8788
"""Release Mixin View for listing all extant OnboardingTasks."""
8889

89-
class ReleaseMixinOnboardingTaskCreateView(ObjectEditView):
90+
class ReleaseMixinOnboardingTaskCreateView(generic.ObjectEditView):
9091
"""Release Mixin View for creating a new OnboardingTask."""
9192

92-
class ReleaseMixinOnboardingTaskBulkDeleteView(BulkDeleteView):
93+
class ReleaseMixinOnboardingTaskBulkDeleteView(generic.BulkDeleteView):
9394
"""Release Mixin View for deleting one or more OnboardingTasks."""
9495

95-
class ReleaseMixinOnboardingTaskFeedBulkImportView(BulkImportView):
96+
class ReleaseMixinOnboardingTaskFeedBulkImportView(generic.BulkImportView):
9697
"""Release Mixin View for bulk-importing a CSV file to create OnboardingTasks."""
9798

9899

0 commit comments

Comments
 (0)