Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netbox/extras/forms/bulk_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ class Meta:
model = EventRule
fields = (
'name', 'description', 'enabled', 'conditions', 'object_types', 'event_types', 'action_type',
'action_object', 'comments', 'tags'
'comments', 'tags'
)

def clean(self):
Expand Down
4 changes: 0 additions & 4 deletions netbox/extras/migrations/0002_squashed_0059.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,6 @@ class Migration(migrations.Migration):
name='webhook',
unique_together={('payload_url', 'type_create', 'type_update', 'type_delete')},
),
migrations.AlterIndexTogether(
name='taggeditem',
index_together={('content_type', 'object_id')},
),
migrations.AlterUniqueTogether(
name='exporttemplate',
unique_together={('content_type', 'name')},
Expand Down
5 changes: 2 additions & 3 deletions netbox/extras/migrations/0087_squashed_0098.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,9 @@ class Migration(migrations.Migration):
name='object_types',
field=models.ManyToManyField(blank=True, related_name='+', to='contenttypes.contenttype'),
),
migrations.RenameIndex(
migrations.AddIndex(
model_name='taggeditem',
new_name='extras_tagg_content_717743_idx',
old_fields=('content_type', 'object_id'),
index=models.Index(fields=['content_type', 'object_id'], name='extras_tagg_content_717743_idx'),
),
migrations.CreateModel(
name='Bookmark',
Expand Down
2 changes: 1 addition & 1 deletion netbox/ipam/forms/model_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ class VLANGroupForm(NetBoxModelForm):
class Meta:
model = VLANGroup
fields = [
'name', 'slug', 'description', 'vid_ranges', 'scope_type', 'scope', 'tags',
'name', 'slug', 'description', 'vid_ranges', 'scope_type', 'tags',
]

def __init__(self, *args, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions netbox/vpn/forms/model_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,13 @@ class TunnelTerminationForm(NetBoxModelForm):
)

fieldsets = (
FieldSet('tunnel', 'role', 'type', 'parent', 'termination', 'outside_ip', 'tags'),
FieldSet('tunnel', 'role', 'type', 'parent', 'termination' 'outside_ip', 'tags'),
)

class Meta:
model = TunnelTermination
fields = [
'tunnel', 'role', 'termination', 'outside_ip', 'tags',
'tunnel', 'role', 'outside_ip', 'tags',
]

def __init__(self, *args, initial=None, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==5.0.9
Django==5.1.2
django-cors-headers==4.4.0
django-debug-toolbar==4.4.6
django-filter==24.3
Expand Down