Skip to content

Commit 71b8469

Browse files
authored
Linkified rules count (#91)
1 parent 91e5d9c commit 71b8469

File tree

4 files changed

+30
-8
lines changed

4 files changed

+30
-8
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,4 @@ cython_debug/
162162
# VS Code
163163
.vscode/
164164
# JetBrains
165-
.idea/
165+
.idea/

netbox_acls/forms/filtersets.py

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@ class ACLStandardRuleFilterForm(NetBoxModelFilterSetForm):
183183

184184
model = ACLStandardRule
185185
tag = TagFilterField(model)
186+
access_list = forms.ModelMultipleChoiceField(
187+
queryset=AccessList.objects.all(),
188+
required=False,
189+
widget=StaticSelectMultiple(),
190+
)
186191
source_prefix = forms.ModelMultipleChoiceField(
187192
queryset=Prefix.objects.all(),
188193
required=False,
@@ -197,7 +202,7 @@ class ACLStandardRuleFilterForm(NetBoxModelFilterSetForm):
197202
)
198203
fieldsets = (
199204
(None, ("q", "tag")),
200-
("Rule Details", ("action", "source_prefix")),
205+
("Rule Details", ("access_list", "action", "source_prefix")),
201206
)
202207

203208

@@ -211,6 +216,11 @@ class ACLExtendedRuleFilterForm(NetBoxModelFilterSetForm):
211216
required=False,
212217
)
213218
tag = TagFilterField(model)
219+
access_list = forms.ModelMultipleChoiceField(
220+
queryset=AccessList.objects.all(),
221+
required=False,
222+
widget=StaticSelectMultiple(),
223+
)
214224
action = forms.ChoiceField(
215225
choices=add_blank_choice(ACLRuleActionChoices),
216226
required=False,
@@ -238,5 +248,14 @@ class ACLExtendedRuleFilterForm(NetBoxModelFilterSetForm):
238248

239249
fieldsets = (
240250
(None, ("q", "tag")),
241-
("Rule Details", ("action", "source_prefix", "desintation_prefix", "protocol")),
251+
(
252+
"Rule Details",
253+
(
254+
"access_list",
255+
"action",
256+
"source_prefix",
257+
"desintation_prefix",
258+
"protocol",
259+
),
260+
),
242261
)

netbox_acls/templates/netbox_acls/accesslist.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ <h5 class="card-header">Access List</h5>
3131
<tr>
3232
<th scope="row">Rules</th>
3333
{% if object.type == 'standard' %}
34-
<td>{{ object.aclstandardrules.count|placeholder }}</td>
34+
<td><a href="{% url 'plugins:netbox_acls:aclstandardrule_list' %}?access_list={{ object.pk }}">{{ object.aclstandardrules.count|placeholder }}</a></td>
3535
{% elif object.type == 'extended' %}
36-
<td>{{ object.aclextendedrules.count|placeholder }}</td>
36+
<td><a href="{% url 'plugins:netbox_acls:aclextendedrule_list' %}?access_list={{ object.pk }}">{{ object.aclextendedrules.count|placeholder }}</a></td>
3737
{% endif %}
3838
</tr>
3939
<tr>

netbox_acls/views.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ def get_extra_addanother_params(self, request):
142142
"""
143143

144144
return {
145-
"access_list": request.GET.get("access_list") or request.POST.get("access_list"),
145+
"access_list": request.GET.get("access_list")
146+
or request.POST.get("access_list"),
146147
"direction": request.GET.get("direction") or request.POST.get("direction"),
147148
}
148149

@@ -199,7 +200,8 @@ def get_extra_addanother_params(self, request):
199200
"""
200201

201202
return {
202-
"access_list": request.GET.get("access_list") or request.POST.get("access_list"),
203+
"access_list": request.GET.get("access_list")
204+
or request.POST.get("access_list"),
203205
}
204206

205207

@@ -255,7 +257,8 @@ def get_extra_addanother_params(self, request):
255257
"""
256258

257259
return {
258-
"access_list": request.GET.get("access_list") or request.POST.get("access_list"),
260+
"access_list": request.GET.get("access_list")
261+
or request.POST.get("access_list"),
259262
}
260263

261264

0 commit comments

Comments
 (0)