Skip to content

Commit

Permalink
added tenants (#94)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattieserver authored Mar 25, 2022
1 parent 68e8aa0 commit e68a8a1
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion netbox_topology_views/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class TopologyViewsConfig(PluginConfig):
name = 'netbox_topology_views'
verbose_name = 'Topology views'
description = 'An plugin to render topology maps'
version = '1.0.2'
version = '1.0.3'
author = 'Mattijs Vanhaverbeke'
author_email = '[email protected]'
base_url = 'netbox_topology_views'
Expand Down
4 changes: 3 additions & 1 deletion netbox_topology_views/filters.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import django_filters
from extras.filters import TagFilter
from dcim.models import Device, DeviceRole, Region, Site, Location
from tenancy.models import TenantGroup, Tenant
from tenancy.filtersets import TenancyFilterSet
from utilities.filters import TreeNodeMultipleChoiceFilter
from django.db.models import Q

class DeviceFilterSet(django_filters.FilterSet):
class DeviceFilterSet(TenancyFilterSet, django_filters.FilterSet):
q = django_filters.CharFilter(
method='search',
label='Search',
Expand Down
6 changes: 5 additions & 1 deletion netbox_topology_views/forms.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
import imp
from django import forms
from django.conf import settings
from django.utils.translation import gettext as _

from extras.models import Tag
from dcim.models import Device, Site, Region, DeviceRole, Location
from tenancy.models import TenantGroup, Tenant
from tenancy.forms import TenancyFilterForm
from django.conf import settings

from utilities.forms import (TagFilterField, DynamicModelMultipleChoiceField, FilterForm)
allow_coordinates_saving = settings.PLUGINS_CONFIG["netbox_topology_views"]["allow_coordinates_saving"]

class DeviceFilterForm(FilterForm):
class DeviceFilterForm(TenancyFilterForm, FilterForm):
model = Device
field_groups = [
['q', 'hide_unconnected', 'save_coords'],
['tenant_group_id', 'tenant_id'],
['region_id', 'site_id', 'location_id'],
['device_role_id'],
['tag'],
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "netbox_topology_views",
"version": "1.0.2",
"version": "1.0.3",
"scripts": {
"resources": "gulp build",
"resources_dev": "gulp build_dev"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

setup(
name='netbox-topology-views',
version='1.0.2',
version='1.0.3',
description='An NetBox plugin to create Topology maps',
url='https://github.com/mattieserver/netbox-topology-views',
author='Mattijs Vanhaverbeke',
Expand Down

0 comments on commit e68a8a1

Please sign in to comment.