Skip to content

Commit

Permalink
Merge pull request #4 from iDebugAll/netbox-2-11-compatibility
Browse files Browse the repository at this point in the history
Quickfix for NetBox v2.11+ compatibility
  • Loading branch information
iDebugAll committed May 5, 2021
2 parents 389a6ae + 9a16636 commit 58a14e5
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions phonebox_plugin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ class PhoneBoxConfig(PluginConfig):
name = 'phonebox_plugin'
verbose_name = 'PhoneBox Plugin'
description = 'Telephone Number Management Plugin for NetBox.'
version = '0.0.1-beta.4'
version = '0.0.1-beta.5'
author = 'Igor Korotchenkov'
author_email = 'iDebugAll@gmail.com'
base_url = 'phonebox'
min_version = "2.10.0"
min_version = "2.11.0"
required_settings = []
default_settings = {}
caching_config = {
Expand Down
4 changes: 2 additions & 2 deletions phonebox_plugin/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
from tenancy.api.nested_serializers import NestedTenantSerializer
from dcim.api.nested_serializers import NestedRegionSerializer
from circuits.api.nested_serializers import NestedProviderSerializer
from extras.api.serializers import TaggedObjectSerializer
from extras.api.serializers import TagSerializer
from .nested_serializers import NestedNumberSerializer


class NumberSerializer(TaggedObjectSerializer, serializers.ModelSerializer):
class NumberSerializer(TagSerializer, serializers.ModelSerializer):

label = serializers.CharField(source='number', read_only=True)
tenant = NestedTenantSerializer(required=True, allow_null=False)
Expand Down
3 changes: 2 additions & 1 deletion phonebox_plugin/models.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.db import models
from extras.models import ChangeLoggedModel, TaggedItem
from extras.models import TaggedItem
from netbox.models import ChangeLoggedModel
from utilities.querysets import RestrictedQuerySet
from django.core.validators import RegexValidator
from taggit.managers import TaggableManager
Expand Down
3 changes: 1 addition & 2 deletions phonebox_plugin/templates/phonebox_plugin/number.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
{% endif %}
</div>
<h1>{% block title %}{{ object }}{% endblock %}</h1>
{% include 'inc/created_updated.html' %}
<ul class="nav nav-tabs">
<li role="presentation"{% if not active_tab %} class="active"{% endif %}>
<a href="{{ object.get_absolute_url }}">Number</a>
Expand Down Expand Up @@ -105,4 +104,4 @@ <h1>{% block title %}{{ object }}{% endblock %}</h1>
</div>
</div>

{% endblock %}
{% endblock %}
1 change: 0 additions & 1 deletion phonebox_plugin/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class NumberListView(generic.ObjectListView):
class NumberView(generic.ObjectView):
queryset = Number.objects.prefetch_related('tenant')


class NumberEditView(generic.ObjectEditView):
queryset = Number.objects.all()
model_form = forms.NumberEditForm
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

setup(
name='phonebox_plugin',
version='0.0.1-beta.4',
version='0.0.1-beta.5',
url='https://github.com/iDebugAll/phonebox-plugin.git',
download_url='https://github.com/iDebugAll/phonebox-plugin/archive/v0.0.1-beta.4.tar.gz',
download_url='https://github.com/iDebugAll/phonebox-plugin/archive/v0.0.1-beta.5.tar.gz',
description='A phone numbers management plugin for NetBox.',
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down

0 comments on commit 58a14e5

Please sign in to comment.