Skip to content

Commit 41e3b1a

Browse files
committed
OnboardingTask Change Log backwards compatability for 2.8 and 2.9 NetBox versions
1 parent 26214a5 commit 41e3b1a

File tree

4 files changed

+194
-94
lines changed

4 files changed

+194
-94
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,5 @@
1-
{% extends 'base.html' %}
2-
{% load helpers %}
3-
{% load static %}
4-
5-
{% block header %}
6-
<div class="row noprint">
7-
<div class="col">
8-
<ol class="breadcrumb">
9-
<li><a href="{% url 'plugins:netbox_onboarding:onboardingtask_list' %}">Onboarding tasks</a></li>
10-
<li>{{ object.pk }}</li>
11-
</ol>
12-
</div>
13-
</div>
14-
15-
<h1>{% block title %}Device: {{ object.ip_address }}{% endblock %}</h1>
16-
17-
<ul class="nav nav-tabs">
18-
<li role="presentation"{% if not active_tab %} class="active"{% endif %}>
19-
<a href="{{ object.get_absolute_url }}">Onboarding Task</a>
20-
</li>
21-
{% if perms.extras.view_objectchange %}
22-
<li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
23-
<a href="{% url 'plugins:netbox_onboarding:onboardingtask_changelog' pk=object.pk %}">Change Log</a>
24-
</li>
25-
{% endif %}
26-
</ul>
27-
{% endblock %}
28-
29-
{% block content %}
30-
<div class="row">
31-
<div class="col-md-7">
32-
<div class="panel panel-default">
33-
<div class="panel-heading">
34-
<strong>Onboarding Task</strong>
35-
</div>
36-
<table class="table table-hover panel-body attr-table">
37-
<tr>
38-
<td>Created Device</td>
39-
<td>{{ object.created_device|placeholder }}</td>
40-
</tr>
41-
<tr>
42-
<td>IP Address</td>
43-
<td>{{ object.ip_address|placeholder }}</td>
44-
</tr>
45-
<tr>
46-
<td>Port</td>
47-
<td>{{ object.port|placeholder }}</td>
48-
</tr>
49-
<tr>
50-
<td>Timeout</td>
51-
<td>{{ object.timeout|placeholder }}</td>
52-
</tr>
53-
<tr>
54-
<td>Site</td>
55-
<td>{{ object.site|placeholder }}</td>
56-
</tr>
57-
<tr>
58-
<td>Role</td>
59-
<td>{{ object.role|placeholder }}</td>
60-
</tr>
61-
<tr>
62-
<td>Device Type</td>
63-
<td>{{ object.device_type|placeholder }}</td>
64-
</tr>
65-
<tr>
66-
<td>Platform</td>
67-
<td>{{ object.platform|placeholder }}</td>
68-
</tr>
69-
<tr>
70-
<td>Status</td>
71-
<td>{{ object.status|placeholder }}</td>
72-
</tr>
73-
<tr>
74-
<td>Failed Reason</td>
75-
<td>{{ object.failed_reason|placeholder }}</td>
76-
</tr>
77-
<tr>
78-
<td>Message</td>
79-
<td>{{ object.message|placeholder }}</td>
80-
</tr>
81-
<tr>
82-
<td>Created</td>
83-
<td>{{ object.created|placeholder }}</td>
84-
</tr>
85-
</table>
86-
</div>
87-
</div>
88-
</div>
89-
{% endblock %}
90-
91-
{% block javascript %}
92-
<script src="{% static 'js/graphs.js' %}?v{{ settings.VERSION }}"></script>
93-
{% endblock %}
1+
{% if "2.8." in settings.VERSION or "2.9." in settings.VERSION %}
2+
{% include 'netbox_onboarding/onboardingtask_lt210.html' %}
3+
{% else %}
4+
{% include 'netbox_onboarding/onboardingtask_ge210.html' %}
5+
{% endif %}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{% extends 'base.html' %}
2+
{% load helpers %}
3+
{% load static %}
4+
5+
{% block header %}
6+
<div class="row noprint">
7+
<div class="col">
8+
<ol class="breadcrumb">
9+
<li><a href="{% url 'plugins:netbox_onboarding:onboardingtask_list' %}">Onboarding tasks</a></li>
10+
<li>{{ object.pk }}</li>
11+
</ol>
12+
</div>
13+
</div>
14+
15+
<h1>{% block title %}Device: {{ object.ip_address }}{% endblock %}</h1>
16+
17+
<ul class="nav nav-tabs">
18+
<li role="presentation"{% if not active_tab %} class="active"{% endif %}>
19+
<a href="{{ object.get_absolute_url }}">Onboarding Task</a>
20+
</li>
21+
{% if perms.extras.view_objectchange %}
22+
<li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
23+
<a href="{% url 'plugins:netbox_onboarding:onboardingtask_changelog' pk=object.pk %}">Change Log</a>
24+
</li>
25+
{% endif %}
26+
</ul>
27+
{% endblock %}
28+
29+
{% block content %}
30+
<div class="row">
31+
<div class="col-md-7">
32+
<div class="panel panel-default">
33+
<div class="panel-heading">
34+
<strong>Onboarding Task</strong>
35+
</div>
36+
<table class="table table-hover panel-body attr-table">
37+
<tr>
38+
<td>Created Device</td>
39+
<td>{{ object.created_device|placeholder }}</td>
40+
</tr>
41+
<tr>
42+
<td>IP Address</td>
43+
<td>{{ object.ip_address|placeholder }}</td>
44+
</tr>
45+
<tr>
46+
<td>Port</td>
47+
<td>{{ object.port|placeholder }}</td>
48+
</tr>
49+
<tr>
50+
<td>Timeout</td>
51+
<td>{{ object.timeout|placeholder }}</td>
52+
</tr>
53+
<tr>
54+
<td>Site</td>
55+
<td>{{ object.site|placeholder }}</td>
56+
</tr>
57+
<tr>
58+
<td>Role</td>
59+
<td>{{ object.role|placeholder }}</td>
60+
</tr>
61+
<tr>
62+
<td>Device Type</td>
63+
<td>{{ object.device_type|placeholder }}</td>
64+
</tr>
65+
<tr>
66+
<td>Platform</td>
67+
<td>{{ object.platform|placeholder }}</td>
68+
</tr>
69+
<tr>
70+
<td>Status</td>
71+
<td>{{ object.status|placeholder }}</td>
72+
</tr>
73+
<tr>
74+
<td>Failed Reason</td>
75+
<td>{{ object.failed_reason|placeholder }}</td>
76+
</tr>
77+
<tr>
78+
<td>Message</td>
79+
<td>{{ object.message|placeholder }}</td>
80+
</tr>
81+
<tr>
82+
<td>Created</td>
83+
<td>{{ object.created|placeholder }}</td>
84+
</tr>
85+
</table>
86+
</div>
87+
</div>
88+
</div>
89+
{% endblock %}
90+
91+
{% block javascript %}
92+
<script src="{% static 'js/graphs.js' %}?v{{ settings.VERSION }}"></script>
93+
{% endblock %}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{% extends 'base.html' %}
2+
{% load helpers %}
3+
{% load static %}
4+
5+
{% block header %}
6+
<div class="row noprint">
7+
<div class="col">
8+
<ol class="breadcrumb">
9+
<li><a href="{% url 'plugins:netbox_onboarding:onboardingtask_list' %}">Onboarding tasks</a></li>
10+
<li>{{ onboardingtask.pk }}</li>
11+
</ol>
12+
</div>
13+
</div>
14+
15+
<h1>{% block title %}Device: {{ onboardingtask.ip_address }}{% endblock %}</h1>
16+
17+
<ul class="nav nav-tabs">
18+
<li role="presentation"{% if not active_tab %} class="active"{% endif %}>
19+
<a href="{{ onboardingtask.get_absolute_url }}">Onboarding Task</a>
20+
</li>
21+
{% if perms.extras.view_onboardingtaskchange %}
22+
<li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
23+
<a href="{% url 'plugins:netbox_onboarding:onboardingtask_changelog' pk=onboardingtask.pk %}">Change Log</a>
24+
</li>
25+
{% endif %}
26+
</ul>
27+
{% endblock %}
28+
29+
{% block content %}
30+
<div class="row">
31+
<div class="col-md-7">
32+
<div class="panel panel-default">
33+
<div class="panel-heading">
34+
<strong>Onboarding Task</strong>
35+
</div>
36+
<table class="table table-hover panel-body attr-table">
37+
<tr>
38+
<td>Created Device</td>
39+
<td>{{ onboardingtask.created_device|placeholder }}</td>
40+
</tr>
41+
<tr>
42+
<td>IP Address</td>
43+
<td>{{ onboardingtask.ip_address|placeholder }}</td>
44+
</tr>
45+
<tr>
46+
<td>Port</td>
47+
<td>{{ onboardingtask.port|placeholder }}</td>
48+
</tr>
49+
<tr>
50+
<td>Timeout</td>
51+
<td>{{ onboardingtask.timeout|placeholder }}</td>
52+
</tr>
53+
<tr>
54+
<td>Site</td>
55+
<td>{{ onboardingtask.site|placeholder }}</td>
56+
</tr>
57+
<tr>
58+
<td>Role</td>
59+
<td>{{ onboardingtask.role|placeholder }}</td>
60+
</tr>
61+
<tr>
62+
<td>Device Type</td>
63+
<td>{{ onboardingtask.device_type|placeholder }}</td>
64+
</tr>
65+
<tr>
66+
<td>Platform</td>
67+
<td>{{ onboardingtask.platform|placeholder }}</td>
68+
</tr>
69+
<tr>
70+
<td>Status</td>
71+
<td>{{ onboardingtask.status|placeholder }}</td>
72+
</tr>
73+
<tr>
74+
<td>Failed Reason</td>
75+
<td>{{ onboardingtask.failed_reason|placeholder }}</td>
76+
</tr>
77+
<tr>
78+
<td>Message</td>
79+
<td>{{ onboardingtask.message|placeholder }}</td>
80+
</tr>
81+
<tr>
82+
<td>Created</td>
83+
<td>{{ onboardingtask.created|placeholder }}</td>
84+
</tr>
85+
</table>
86+
</div>
87+
</div>
88+
</div>
89+
{% endblock %}
90+
91+
{% block javascript %}
92+
<script src="{% static 'js/graphs.js' %}?v{{ settings.VERSION }}"></script>
93+
{% endblock %}

netbox_onboarding/views.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ def get(self, request, pk): # pylint: disable=invalid-name, missing-function-do
106106
"""Get request."""
107107
instance = get_object_or_404(self.queryset, pk=pk)
108108

109-
return render(request, "netbox_onboarding/onboardingtask.html", {"object": instance,})
109+
return render(
110+
request, "netbox_onboarding/onboardingtask.html", {"object": instance, "onboardingtask": instance}
111+
)
110112

111113

112114
class OnboardingTaskListView(ReleaseMixinOnboardingTaskListView):

0 commit comments

Comments
 (0)