Merge branch 'develop' into feature

This commit is contained in:
Jeremy Stretch
2023-12-15 16:52:42 -05:00
40 changed files with 396 additions and 85 deletions

View File

@@ -951,7 +951,7 @@ class VLANGroupVLANsView(generic.ObjectChildrenView):
def prep_table_data(self, request, queryset, parent):
if not get_table_ordering(request, self.table):
return add_available_vlans(parent.get_child_vlans(), parent)
return add_available_vlans(queryset, parent)
return queryset