1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
Fix runtime issues with NetBox 3.3+
See also:
https://github.com/iDebugAll/phonebox_plugin/issues/27
https://github.com/iDebugAll/phonebox_plugin/pull/28
--- MANIFEST.in.orig 2023-02-21 21:36:03 UTC
+++ MANIFEST.in
@@ -1,4 +1,5 @@ recursive-include phonebox_plugin/templates *
include README.md
include LICENSE
recursive-include phonebox_plugin/templates *
+recursive-exclude phonebox_plugin/templates *.orig .DS_Store
recursive-include phonebox_plugin/static *
--- phonebox_plugin/api/nested_serializers.py.orig 2021-09-21 14:31:12 UTC
+++ phonebox_plugin/api/nested_serializers.py
@@ -1,6 +1,12 @@ from phonebox_plugin import models
from rest_framework import serializers
from phonebox_plugin import models
-from netbox.api import WritableNestedSerializer
+
+try:
+ from netbox.api import ChoiceField, WritableNestedSerializer
+except ImportError:
+ from netbox.api.fields import ChoiceField
+ from netbox.api.serializers.nested import WritableNestedSerializer
+
from tenancy.api.nested_serializers import NestedTenantSerializer
__all__ = ["NestedNumberSerializer", ]
--- phonebox_plugin/templates/phonebox_plugin/list_view_3.4.html.orig 2023-02-21 21:32:23 UTC
+++ phonebox_plugin/templates/phonebox_plugin/list_view_3.4.html
@@ -0,0 +1,62 @@
+{% extends 'base/layout.html' %}
+{% load buttons %}
+{% load static %}
+{% load plugins %}
+{% load helpers %}
+
+
+{% block controls %}
+
+<div class="pull-right noprint">
+ {% if perms.phonebox_plugin.add_number %}
+ <a href="/plugins/phonebox/add_number/" type="button" class="btn btn-sm btn-success">
+ <i class="mdi mdi-plus-thick"></i> Add
+ </a>
+ {% endif %}
+ {% if perms.phonebox_plugin.add_number %}
+ <a href="/plugins/phonebox/import_numbers/" type="button" class="btn btn-sm btn-info">
+ <i class="mdi mdi-upload"></i> Import
+ </a>
+ {% endif %}
+</div>
+
+{% endblock %}
+
+
+{% block content %}
+
+<ul class="nav nav-tabs px-3">
+ <li class="nav-item" role="presentation">
+ <button class="nav-link active" id="numbers-tab" data-bs-toggle="tab" data-bs-target="#numbers" type="button" role="tab" aria-controls="numbers" aria-selected="true">
+ Numbers
+ </button>
+ </li>
+ <li class="nav-item" role="presentation">
+ <button class="nav-link" id="filters-form-tab" data-bs-toggle="tab" data-bs-target="#filters-form" type="button" role="tab" aria-controls="filters-form" aria-selected="false">
+ Filters
+ {% if filter_form %}{% badge filter_form.changed_data|length %}{% endif %}
+ </button>
+ </li>
+</ul>
+
+<div class="tab-content">
+ <div class="tab-pane active" id="numbers" role="tabpanel" aria-labelledby="numbers-tab">
+
+ {# Applied filters #}
+ {% if filter_form %}
+ {% applied_filters model filter_form request.GET %}
+ {% endif %}
+
+ <h2>{% block title %}Numbers{% endblock %}</h2>
+ <div class="row">
+ <div class="col-md-12">
+ {% include 'phonebox_plugin/obj_table.html' with bulk_delete_url="plugins:phonebox_plugin:number_bulk_delete" bulk_edit_url="plugins:phonebox_plugin:number_bulk_edit" %}
+ </div>
+ </div>
+ </div>
+ <div class="tab-pane" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
+ {% include 'inc/filter_list.html' %}
+ </div>
+</div>
+
+{% endblock %}
--- phonebox_plugin/templates/phonebox_plugin/voice_circuit_list_view_3.4.html.orig 2023-02-21 21:32:23 UTC
+++ phonebox_plugin/templates/phonebox_plugin/voice_circuit_list_view_3.4.html
@@ -0,0 +1,62 @@
+{% extends 'base/layout.html' %}
+{% load buttons %}
+{% load static %}
+{% load plugins %}
+{% load helpers %}
+
+
+{% block controls %}
+
+<div class="pull-right noprint">
+ {% if perms.phonebox_plugin.add_voice_circuit %}
+ <a href="{% url 'plugins:phonebox_plugin:add_voice_circuit' %}" type="button" class="btn btn-sm btn-success">
+ <i class="mdi mdi-plus-thick"></i> Add
+ </a>
+ {% endif %}
+ {% if perms.phonebox_plugin.add_voice_circuit %}
+ <a href="{% url 'plugins:phonebox_plugin:import_voice_circuits' %}" type="button" class="btn btn-sm btn-info">
+ <i class="mdi mdi-upload"></i> Import
+ </a>
+ {% endif %}
+</div>
+
+{% endblock %}
+
+
+{% block content %}
+
+<ul class="nav nav-tabs px-3">
+ <li class="nav-item" role="presentation">
+ <button class="nav-link active" id="voice_circuits-tab" data-bs-toggle="tab" data-bs-target="#voice_circuits" type="button" role="tab" aria-controls="voice_circuits" aria-selected="true">
+ Voice Circuits
+ </button>
+ </li>
+ <li class="nav-item" role="presentation">
+ <button class="nav-link" id="filters-form-tab" data-bs-toggle="tab" data-bs-target="#filters-form" type="button" role="tab" aria-controls="filters-form" aria-selected="false">
+ Filters
+ {% if filter_form %}{% badge filter_form.changed_data|length %}{% endif %}
+ </button>
+ </li>
+</ul>
+
+<div class="tab-content">
+ <div class="tab-pane active" id="voice_circuits" role="tabpanel" aria-labelledby="voice_circuits-tab">
+
+ {# Applied filters #}
+ {% if filter_form %}
+ {% applied_filters model filter_form request.GET %}
+ {% endif %}
+
+ <h2>{% block title %}Voice Circuits{% endblock %}</h2>
+ <div class="row">
+ <div class="col-md-12">
+ {% include 'phonebox_plugin/obj_table.html' with bulk_delete_url="plugins:phonebox_plugin:voice_circuit_bulk_delete" bulk_edit_url="plugins:phonebox_plugin:voice_circuit_bulk_edit" %}
+ </div>
+ </div>
+ </div>
+ <div class="tab-pane" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
+ {% include 'inc/filter_list.html' %}
+ </div>
+</div>
+
+{% endblock %}
--- phonebox_plugin/views.py.orig 2022-06-09 10:46:13 UTC
+++ phonebox_plugin/views.py
@@ -18,8 +18,10 @@ class NumberListView(generic.ObjectListView):
filterset = filters.NumberFilterSet
filterset_form = forms.NumberFilterForm
table = tables.NumberTable
- if NETBOX_CURRENT_VERSION >= version.parse("3.0"):
+ if NETBOX_CURRENT_VERSION >= version.parse("3.0") and NETBOX_CURRENT_VERSION < version.parse("3.4"):
template_name = "phonebox_plugin/list_view_3.x.html"
+ elif NETBOX_CURRENT_VERSION >= version.parse("3.4"):
+ template_name = "phonebox_plugin/list_view_3.4.html"
else:
template_name = "phonebox_plugin/list_view.html"
@@ -76,8 +78,10 @@ class VoiceCircuitListView(generic.ObjectListView):
filterset = filters.VoiceCircuitFilterSet
filterset_form = forms.VoiceCircuitFilterForm
table = tables.VoiceCircuitTable
- if NETBOX_CURRENT_VERSION >= version.parse("3.0"):
+ if NETBOX_CURRENT_VERSION >= version.parse("3.0") and NETBOX_CURRENT_VERSION < version.parse("3.4"):
template_name = "phonebox_plugin/voice_circuit_list_view_3.x.html"
+ elif NETBOX_CURRENT_VERSION >= version.parse("3.4"):
+ template_name = "phonebox_plugin/voice_circuit_list_view_3.4.html"
else:
template_name = "phonebox_plugin/voice_circuit_list_view.html"
|
