| Manufacturer |
diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index 4e2706daf..0748bc5ca 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -33,7 +33,7 @@
Interface Assignment
- {% with vm_tab_active=obj.vminterface.exists %}
+ {% with vm_tab_active=form.initial.vminterface %}
- Device
- Virtual Machine
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 2c3963c0a..134e9d026 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -9,6 +9,49 @@ from extras.admin import order_content_types
from .models import AdminGroup, AdminUser, ObjectPermission, Token, UserConfig
+#
+# Inline models
+#
+
+class ObjectPermissionInline(admin.TabularInline):
+ exclude = None
+ extra = 3
+ readonly_fields = ['object_types', 'actions', 'constraints']
+ verbose_name = 'Permission'
+ verbose_name_plural = 'Permissions'
+
+ def get_queryset(self, request):
+ return super().get_queryset(request).prefetch_related('objectpermission__object_types')
+
+ @staticmethod
+ def object_types(instance):
+ # Don't call .values_list() here because we want to reference the pre-fetched object_types
+ return ', '.join([ot.name for ot in instance.objectpermission.object_types.all()])
+
+ @staticmethod
+ def actions(instance):
+ return ', '.join(instance.objectpermission.actions)
+
+ @staticmethod
+ def constraints(instance):
+ return instance.objectpermission.constraints
+
+
+class GroupObjectPermissionInline(ObjectPermissionInline):
+ model = AdminGroup.object_permissions.through
+
+
+class UserObjectPermissionInline(ObjectPermissionInline):
+ model = AdminUser.object_permissions.through
+
+
+class UserConfigInline(admin.TabularInline):
+ model = UserConfig
+ readonly_fields = ('data',)
+ can_delete = False
+ verbose_name = 'Preferences'
+
+
#
# Users & groups
#
@@ -24,40 +67,13 @@ class GroupAdmin(admin.ModelAdmin):
list_display = ('name', 'user_count')
ordering = ('name',)
search_fields = ('name',)
+ inlines = [GroupObjectPermissionInline]
- def user_count(self, obj):
+ @staticmethod
+ def user_count(obj):
return obj.user_set.count()
-class UserConfigInline(admin.TabularInline):
- model = UserConfig
- readonly_fields = ('data',)
- can_delete = False
- verbose_name = 'Preferences'
-
-
-class ObjectPermissionInline(admin.TabularInline):
- model = AdminUser.object_permissions.through
- fields = ['object_types', 'actions', 'constraints']
- readonly_fields = fields
- extra = 0
- verbose_name = 'Permission'
- verbose_name_plural = 'Permissions'
-
- def object_types(self, instance):
- return ', '.join(instance.objectpermission.object_types.values_list('model', flat=True))
-
- def actions(self, instance):
- return ', '.join(instance.objectpermission.actions)
-
- def constraints(self, instance):
- return instance.objectpermission.constraints
-
- def has_add_permission(self, request, obj):
- # Don't allow the creation of new ObjectPermission assignments via this form
- return False
-
-
@admin.register(AdminUser)
class UserAdmin(UserAdmin_):
list_display = [
@@ -71,9 +87,13 @@ class UserAdmin(UserAdmin_):
}),
('Important dates', {'fields': ('last_login', 'date_joined')}),
)
- inlines = [ObjectPermissionInline, UserConfigInline]
filter_horizontal = ('groups',)
+ def get_inlines(self, request, obj):
+ if obj is not None:
+ return (UserObjectPermissionInline, UserConfigInline)
+ return ()
+
#
# REST API tokens
@@ -212,7 +232,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
actions = ('enable', 'disable')
fieldsets = (
(None, {
- 'fields': ('name', 'enabled')
+ 'fields': ('name', 'description', 'enabled')
}),
('Actions', {
'fields': (('can_view', 'can_add', 'can_change', 'can_delete'), 'actions')
@@ -231,19 +251,16 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
filter_horizontal = ('object_types', 'groups', 'users')
form = ObjectPermissionForm
list_display = [
- 'get_name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
+ 'name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints', 'description',
]
list_filter = [
'enabled', ActionListFilter, ObjectTypeListFilter, 'groups', 'users'
]
+ search_fields = ['actions', 'constraints', 'description', 'name']
def get_queryset(self, request):
return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
- def get_name(self, obj):
- return obj.name or f'Permission #{obj.pk}'
- get_name.short_description = 'Name'
-
def list_models(self, obj):
return ', '.join([f"{ct}" for ct in obj.object_types.all()])
list_models.short_description = 'Models'
diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
index 5141abb10..1f338d6e4 100644
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -54,4 +54,6 @@ class ObjectPermissionSerializer(ValidatedModelSerializer):
class Meta:
model = ObjectPermission
- fields = ('id', 'url', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions', 'constraints')
+ fields = (
+ 'id', 'url', 'name', 'description', 'enabled', 'object_types', 'groups', 'users', 'actions', 'constraints',
+ )
diff --git a/netbox/users/migrations/0008_objectpermission.py b/netbox/users/migrations/0008_objectpermission.py
index 2df065898..8ed15b6a1 100644
--- a/netbox/users/migrations/0008_objectpermission.py
+++ b/netbox/users/migrations/0008_objectpermission.py
@@ -18,7 +18,8 @@ class Migration(migrations.Migration):
name='ObjectPermission',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
- ('name', models.CharField(blank=True, max_length=100)),
+ ('name', models.CharField(max_length=100)),
+ ('description', models.CharField(blank=True, max_length=200)),
('enabled', models.BooleanField(default=True)),
('constraints', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
@@ -27,6 +28,7 @@ class Migration(migrations.Migration):
('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
],
options={
+ 'ordering': ['name'],
'verbose_name': 'permission',
},
),
diff --git a/netbox/users/migrations/0009_replicate_permissions.py b/netbox/users/migrations/0009_replicate_permissions.py
index a5d28beac..4583da302 100644
--- a/netbox/users/migrations/0009_replicate_permissions.py
+++ b/netbox/users/migrations/0009_replicate_permissions.py
@@ -13,7 +13,7 @@ def replicate_permissions(apps, schema_editor):
# TODO: Optimize this iteration so that ObjectPermissions with identical sets of users and groups
# are combined into a single ObjectPermission instance.
- for perm in Permission.objects.all():
+ for perm in Permission.objects.select_related('content_type'):
if perm.codename.split('_')[0] in ACTIONS:
action = perm.codename.split('_')[0]
elif perm.codename == 'activate_userkey':
@@ -24,7 +24,11 @@ def replicate_permissions(apps, schema_editor):
action = perm.codename
if perm.group_set.exists() or perm.user_set.exists():
- obj_perm = ObjectPermission(actions=[action])
+ obj_perm = ObjectPermission(
+ # Copy name from original Permission object
+ name=f'{perm.content_type.app_label}.{perm.codename}'[:100],
+ actions=[action]
+ )
obj_perm.save()
obj_perm.object_types.add(perm.content_type)
if perm.group_set.exists():
diff --git a/netbox/users/models.py b/netbox/users/models.py
index b8c799d65..6edbd9352 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -16,6 +16,8 @@ from utilities.utils import flatten_dict
__all__ = (
+ 'AdminGroup',
+ 'AdminUser',
'ObjectPermission',
'Token',
'UserConfig',
@@ -237,7 +239,10 @@ class ObjectPermission(models.Model):
identified by ORM query parameters.
"""
name = models.CharField(
- max_length=100,
+ max_length=100
+ )
+ description = models.CharField(
+ max_length=200,
blank=True
)
enabled = models.BooleanField(
@@ -275,12 +280,8 @@ class ObjectPermission(models.Model):
objects = RestrictedQuerySet.as_manager()
class Meta:
+ ordering = ['name']
verbose_name = "permission"
def __str__(self):
- if self.name:
- return self.name
- return '{}: {}'.format(
- ', '.join(self.object_types.values_list('model', flat=True)),
- ', '.join(self.actions)
- )
+ return self.name
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index 1cd5892e9..c4229bff9 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -97,6 +97,7 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
for i in range(0, 3):
objectpermission = ObjectPermission(
+ name=f'Permission {i+1}',
actions=['view', 'add', 'change', 'delete'],
constraints={'name': f'TEST{i+1}'}
)
@@ -107,6 +108,7 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
cls.create_data = [
{
+ 'name': 'Permission 4',
'object_types': ['dcim.site'],
'groups': [groups[0].pk],
'users': [users[0].pk],
@@ -114,6 +116,7 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
'constraints': {'name': 'TEST4'},
},
{
+ 'name': 'Permission 5',
'object_types': ['dcim.site'],
'groups': [groups[1].pk],
'users': [users[1].pk],
@@ -121,6 +124,7 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
'constraints': {'name': 'TEST5'},
},
{
+ 'name': 'Permission 6',
'object_types': ['dcim.site'],
'groups': [groups[2].pk],
'users': [users[2].pk],
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index ab44658b4..99dd0c65c 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -178,7 +178,7 @@ def get_docs(model):
model._meta.model_name
)
try:
- with open(path) as docfile:
+ with open(path, encoding='utf-8') as docfile:
content = docfile.read()
except FileNotFoundError:
return "Unable to load documentation, file not found: {}".format(path)
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 50ac87e50..5f87ed1bf 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -418,13 +418,14 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
try:
with transaction.atomic():
+ object_created = form.instance.pk is None
obj = form.save()
# Check that the new object conforms with any assigned object-level permissions
self.queryset.get(pk=obj.pk)
msg = '{} {}'.format(
- 'Created' if not form.instance.pk else 'Modified',
+ 'Created' if object_created else 'Modified',
self.queryset.model._meta.verbose_name
)
logger.info(f"{msg} {obj} (PK: {obj.pk})")
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index dde5a8d3f..62a551df3 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -1,4 +1,4 @@
-from django.db.models import Count, Prefetch
+from django.db.models import Count
from django.shortcuts import get_object_or_404
from rest_framework.decorators import action
from rest_framework.response import Response
@@ -7,7 +7,6 @@ from dcim.models import Device
from extras.api.serializers import RenderedGraphSerializer
from extras.api.views import CustomFieldModelViewSet
from extras.models import Graph
-from ipam.models import VLAN
from utilities.api import ModelViewSet
from utilities.utils import get_subquery
from virtualization import filters
diff --git a/requirements.txt b/requirements.txt
index d7f215d12..0ab9ca3de 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,5 +20,4 @@ Pillow==7.2.0
psycopg2-binary==2.8.5
pycryptodome==3.9.8
PyYAML==5.3.1
-redis==3.5.3
svgwrite==1.4
diff --git a/upgrade.sh b/upgrade.sh
index 75afa1db4..66ba7b39f 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -40,11 +40,12 @@ echo "Installing core dependencies ($COMMAND)..."
eval $COMMAND || exit 1
# Install optional packages (if any)
-if [ -f "local_requirements.txt" ]
-then
+if [ -s "local_requirements.txt" ]; then
COMMAND="pip3 install -r local_requirements.txt"
echo "Installing local dependencies ($COMMAND)..."
eval $COMMAND || exit 1
+elif [ -f "local_requirements.txt" ]; then
+ echo "Skipping local dependencies (local_requirements.txt is empty)"
else
echo "Skipping local dependencies (local_requirements.txt not found)"
fi
|