Skip to content

Commit 70ce36c

Browse files
kprince28kprince28
authored
Merge pull request #88 from Onemind-Services-LLC/dev
Release v0.9.0
2 parents b5cc013 + e89e77e commit 70ce36c

10 files changed

Lines changed: 89 additions & 98 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ To use GraphQL API you need to set GitHub personal access token in plugin settin
1818
| 4.2.x | 0.6.x |
1919
| 4.3.x | 0.7.x |
2020
| 4.4.x | 0.8.x |
21+
| 4.5.x | 0.9.x |
2122

2223
## Installation
2324

‎netbox_metatype_importer/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ class NetBoxMetatypeImporterConfig(PluginConfig):
1313
author = metadata.get('Author')
1414
author_email = metadata.get('Author-email')
1515
base_url = "meta-types"
16-
min_version = '4.4.0'
17-
max_version = '4.4.99'
16+
min_version = '4.5.0'
17+
max_version = '4.5.99'
1818
default_settings = {
1919
'repo_owner': 'netbox-community',
2020
'repo': 'devicetype-library',

‎netbox_metatype_importer/api/views.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from django.conf import settings
55
from django.db import transaction
66
from django.db.models import Q
7-
from django.shortcuts import reverse
7+
from django.urls import reverse
88
from django.utils.text import slugify
99
from rest_framework import mixins as drf_mixins, status
1010
from rest_framework.response import Response
@@ -47,7 +47,7 @@ class ModuleTypeListViewSet(drf_mixins.ListModelMixin, BaseViewSet):
4747

4848
class RackTypeListViewSet(drf_mixins.ListModelMixin, BaseViewSet):
4949
serializer_class = serializers.MetaTypeSerializer
50-
queryset = MetaType.objects.filter(type=TypeChoices.TYPE_RACK)
50+
queryset = MetaType.objects.filter(type=TypeChoices.TYPE_RACK).order_by('id')
5151
filterset_class = MetaTypeFilterSet
5252

5353

‎netbox_metatype_importer/filters.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import django_filters
22
from django.db.models import Q
33

4+
from netbox.filtersets import BaseFilterSet
5+
from utilities.filtersets import register_filterset
6+
47
from .models import MetaType
58

69

7-
class MetaTypeFilterSet(django_filters.FilterSet):
10+
@register_filterset
11+
class MetaTypeFilterSet(BaseFilterSet):
812
q = django_filters.CharFilter(
913
method='search',
1014
label='Search',

‎netbox_metatype_importer/forms.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
from django import forms
22

3-
from .models import MetaType
3+
from netbox.forms import NetBoxModelFilterSetForm
44

5+
from .models import MetaType
56

6-
class MetaTypeFilterForm(forms.Form):
7-
q = forms.CharField(required=False, label='Name')
87

8+
class MetaTypeFilterForm(NetBoxModelFilterSetForm):
9+
model = MetaType
910
vendor = forms.CharField(required=False, label='Vendor')
10-
11-
class Meta:
12-
model = MetaType
13-
fields = ['q', 'vendor']

‎netbox_metatype_importer/templates/netbox_metatype_importer/metadevicetype_list.html‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,31 @@
44
{% block title %}DeviceType Imports{% endblock %}
55

66
{% block extra_controls %}
7-
<div class="pull-right noprint">
8-
{% if perms.netbox_metatype_importer.add_metatype %}
9-
<form method="post">
10-
{% csrf_token %}
11-
<button type="submit" name="_load"
12-
formaction="{% url 'plugins:netbox_metatype_importer:metadevicetype_load' %}?return_url={% url 'plugins:netbox_metatype_importer:metadevicetype_list' %}"
13-
class="btn btn-primary">
14-
<span class="mdi mdi-download" aria-hidden="true"></span> Load
15-
</button>
16-
</form>
17-
{% endif %}
18-
</div>
7+
{% if perms.netbox_metatype_importer.add_metatype %}
8+
<form method="post" class="d-inline d-print-none">
9+
{% csrf_token %}
10+
<button type="submit" name="_load"
11+
formaction="{% url 'plugins:netbox_metatype_importer:metadevicetype_load' %}?return_url={% url 'plugins:netbox_metatype_importer:metadevicetype_list' %}"
12+
class="btn btn-primary">
13+
<i class="mdi mdi-download" aria-hidden="true"></i> Load
14+
</button>
15+
</form>
16+
{% endif %}
1917
{% endblock %}
2018

2119
{% block bulk_buttons %}
22-
{% if perms.netbox_metatype_importer.add_metatype %}
23-
<button type="submit" name="_edit" formaction="
24-
25-
26-
{% url 'plugins:netbox_metatype_importer:metadevicetype_import' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
27-
class="btn btn-warning">
28-
<span class="mdi mdi-upload" aria-hidden="true"></span> Import Selected
29-
</button>
30-
{% endif %}
31-
{% if perms.netbox_metatype_importer.delete_metatype %}
32-
<button type="submit" name="_edit" formaction="
33-
34-
35-
{% url 'plugins:netbox_metatype_importer:bulk_metadevicetype_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
36-
class="btn btn-danger">
37-
<span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected
38-
</button>
39-
{% endif %}
20+
{% if perms.netbox_metatype_importer.add_metatype %}
21+
<button type="submit" name="_edit"
22+
formaction="{% url 'plugins:netbox_metatype_importer:metadevicetype_import' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
23+
class="btn btn-warning">
24+
<i class="mdi mdi-upload" aria-hidden="true"></i> Import Selected
25+
</button>
26+
{% endif %}
27+
{% if perms.netbox_metatype_importer.delete_metatype %}
28+
<button type="submit" name="_edit"
29+
formaction="{% url 'plugins:netbox_metatype_importer:bulk_metadevicetype_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
30+
class="btn btn-danger">
31+
<i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete Selected
32+
</button>
33+
{% endif %}
4034
{% endblock %}

‎netbox_metatype_importer/templates/netbox_metatype_importer/metamoduletype_list.html‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,30 @@
33
{% block title %}ModuleType Imports{% endblock %}
44

55
{% block extra_controls %}
6-
<div class="pull-right noprint">
7-
{% if perms.netbox_metatype_importer.add_metatype %}
8-
<form method="post">
9-
{% csrf_token %}
10-
<button type="submit" name="_load"
11-
formaction="{% url 'plugins:netbox_metatype_importer:metamoduletype_load' %}?return_url={% url 'plugins:netbox_metatype_importer:metamoduletype_list' %}"
12-
class="btn btn-primary">
13-
<span class="mdi mdi-download" aria-hidden="true"></span> Load
14-
</button>
15-
</form>
16-
{% endif %}
17-
</div>
6+
{% if perms.netbox_metatype_importer.add_metatype %}
7+
<form method="post" class="d-inline d-print-none">
8+
{% csrf_token %}
9+
<button type="submit" name="_load"
10+
formaction="{% url 'plugins:netbox_metatype_importer:metamoduletype_load' %}?return_url={% url 'plugins:netbox_metatype_importer:metamoduletype_list' %}"
11+
class="btn btn-primary">
12+
<i class="mdi mdi-download" aria-hidden="true"></i> Load
13+
</button>
14+
</form>
15+
{% endif %}
1816
{% endblock %}
1917
{% block bulk_buttons %}
20-
{% if perms.netbox_metatype_importer.add_metatype %}
21-
<button type="submit" name="_edit" formaction="
22-
{% url 'plugins:netbox_metatype_importer:metamoduletype_import' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
23-
class="btn btn-warning">
24-
<span class="mdi mdi-upload" aria-hidden="true"></span> Import Selected
25-
</button>
26-
{% endif %}
27-
{% if perms.netbox_metatype_importer.delete_metatype %}
28-
<button type="submit" name="_edit" formaction="
29-
30-
31-
{% url 'plugins:netbox_metatype_importer:bulk_metamoduletype_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
32-
class="btn btn-danger">
33-
<span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected
34-
</button>
35-
{% endif %}
18+
{% if perms.netbox_metatype_importer.add_metatype %}
19+
<button type="submit" name="_edit"
20+
formaction="{% url 'plugins:netbox_metatype_importer:metamoduletype_import' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
21+
class="btn btn-warning">
22+
<i class="mdi mdi-upload" aria-hidden="true"></i> Import Selected
23+
</button>
24+
{% endif %}
25+
{% if perms.netbox_metatype_importer.delete_metatype %}
26+
<button type="submit" name="_edit"
27+
formaction="{% url 'plugins:netbox_metatype_importer:bulk_metamoduletype_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
28+
class="btn btn-danger">
29+
<i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete Selected
30+
</button>
31+
{% endif %}
3632
{% endblock %}

‎netbox_metatype_importer/templates/netbox_metatype_importer/metaracktype_list.html‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,30 @@
33
{% block title %}RackType Imports{% endblock %}
44

55
{% block extra_controls %}
6-
<div class="pull-right noprint">
7-
{% if perms.netbox_metatype_importer.add_metatype %}
8-
<form method="post">
9-
{% csrf_token %}
10-
<button type="submit" name="_load"
11-
formaction="{% url 'plugins:netbox_metatype_importer:metaracktype_load' %}?return_url={% url 'plugins:netbox_metatype_importer:metaracktype_list' %}"
12-
class="btn btn-primary">
13-
<span class="mdi mdi-download" aria-hidden="true"></span> Load
14-
</button>
15-
</form>
16-
{% endif %}
17-
</div>
6+
{% if perms.netbox_metatype_importer.add_metatype %}
7+
<form method="post" class="d-inline d-print-none">
8+
{% csrf_token %}
9+
<button type="submit" name="_load"
10+
formaction="{% url 'plugins:netbox_metatype_importer:metaracktype_load' %}?return_url={% url 'plugins:netbox_metatype_importer:metaracktype_list' %}"
11+
class="btn btn-primary">
12+
<i class="mdi mdi-download" aria-hidden="true"></i> Load
13+
</button>
14+
</form>
15+
{% endif %}
1816
{% endblock %}
1917
{% block bulk_buttons %}
20-
{% if perms.netbox_metatype_importer.add_metatype %}
21-
<button type="submit" name="_edit" formaction="
22-
{% url 'plugins:netbox_metatype_importer:metaracktype_import' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
23-
class="btn btn-warning">
24-
<span class="mdi mdi-upload" aria-hidden="true"></span> Import Selected
25-
</button>
26-
{% endif %}
27-
{% if perms.netbox_metatype_importer.delete_metatype %}
28-
<button type="submit" name="_edit" formaction="
29-
{% url 'plugins:netbox_metatype_importer:bulk_metaracktype_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
30-
class="btn btn-danger">
31-
<span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected
32-
</button>
33-
{% endif %}
18+
{% if perms.netbox_metatype_importer.add_metatype %}
19+
<button type="submit" name="_edit"
20+
formaction="{% url 'plugins:netbox_metatype_importer:metaracktype_import' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
21+
class="btn btn-warning">
22+
<i class="mdi mdi-upload" aria-hidden="true"></i> Import Selected
23+
</button>
24+
{% endif %}
25+
{% if perms.netbox_metatype_importer.delete_metatype %}
26+
<button type="submit" name="_edit"
27+
formaction="{% url 'plugins:netbox_metatype_importer:bulk_metaracktype_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
28+
class="btn btn-danger">
29+
<i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete Selected
30+
</button>
31+
{% endif %}
3432
{% endblock %}

‎netbox_metatype_importer/views.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
from django.contrib import messages
55
from django.db import transaction
66
from django.http import HttpResponseForbidden
7-
from django.shortcuts import redirect, reverse
7+
from django.shortcuts import redirect
8+
from django.urls import reverse
89
from django.utils.text import slugify
910
from django.views.generic import View
1011

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
setup(
1313
name='netbox-metatype-importer',
14-
version='0.8.1',
14+
version='0.9.0',
1515
description=description,
1616
long_description=long_description,
1717
long_description_content_type="text/markdown",

0 commit comments

Comments
 (0)