NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 09:08:15 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

PEP 8 resolution

Browse Source
This commit is contained in:
Andy Gauge 2018-08-13 11:14:32 -07:00
parent 780f3cda5b
commit 761ac9230b
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/dcim/models.py
View File

@ -1294,7 +1294,6 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
objects = DeviceManager() objects = DeviceManager()
tags = TaggableManager() tags = TaggableManager()
csv_headers = [ csv_headers = [
'name', 'device_role', 'tenant', 'manufacturer', 'model_name', 'platform', 'serial', 'asset_tag', 'status', 'name', 'device_role', 'tenant', 'manufacturer', 'model_name', 'platform', 'serial', 'asset_tag', 'status',
'site', 'rack_group', 'rack_name', 'position', 'face', 'comments', 'site', 'rack_group', 'rack_name', 'position', 'face', 'comments',

6
netbox/netbox/settings.py
View File

@ -130,8 +130,6 @@ EMAIL_SUBJECT_PREFIX = '[NetBox] '
# Installed applications # Installed applications
INSTALLED_APPS = [ INSTALLED_APPS = [
'corsheaders',
'debug_toolbar',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
@ -139,9 +137,10 @@ INSTALLED_APPS = [
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django.contrib.humanize', 'django.contrib.humanize',
'corsheaders',
'debug_toolbar',
'django_filters', 'django_filters',
'django_tables2', 'django_tables2',
'drf_yasg',
'mptt', 'mptt',
'rest_framework', 'rest_framework',
'taggit', 'taggit',
@ -156,6 +155,7 @@ INSTALLED_APPS = [
'users', 'users',
'utilities', 'utilities',
'virtualization', 'virtualization',
'drf_yasg',
] ]
# Only load django-rq if the webhook backend is enabled # Only load django-rq if the webhook backend is enabled

1
netbox/secrets/api/serializers.py
View File

@ -43,6 +43,7 @@ class SecretObjectRelatedField(serializers.RelatedField):
dict.update({'class': 'device'}) dict.update({'class': 'device'})
return dict return dict
class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer): class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer):
object = SecretObjectRelatedField(queryset=Secret.objects.all(), required=False) object = SecretObjectRelatedField(queryset=Secret.objects.all(), required=False)
role = NestedSecretRoleSerializer() role = NestedSecretRoleSerializer()

4
netbox/secrets/migrations/0007_populate_generic_foreign_key.py
View File

@ -2,6 +2,7 @@
from django.db import migrations from django.db import migrations
def migrate_device_secret(apps, schema_editor): def migrate_device_secret(apps, schema_editor):
""" """
Move data from device foreign key into GenericForeignKey Move data from device foreign key into GenericForeignKey
@ -17,6 +18,7 @@ def migrate_device_secret(apps, schema_editor):
secret.object_id = secret.device.pk secret.object_id = secret.device.pk
secret.save() secret.save()
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
@ -25,5 +27,5 @@ class Migration(migrations.Migration):
] ]
operations = [ operations = [
migrations.RunPython(migrate_device_secret) migrations.RunPython(migrate_device_secret)
] ]

2
netbox/secrets/models.py
View File

@ -350,7 +350,7 @@ class Secret(ChangeLoggedModel, CustomFieldModel):
content_type = models.ForeignKey( content_type = models.ForeignKey(
ContentType, ContentType,
on_delete=models.CASCADE, on_delete=models.CASCADE,
default= ContentType.objects.get(app_label='dcim', model='device').pk default=ContentType.objects.get(app_label='dcim', model='device').pk
) )
object_id = models.PositiveIntegerField(default=1) object_id = models.PositiveIntegerField(default=1)
object = GenericForeignKey('content_type', 'object_id') object = GenericForeignKey('content_type', 'object_id')

6
netbox/secrets/views.py
View File

@ -100,9 +100,9 @@ def secret_add(request, pk):
object = path.split(os.sep)[2] object = path.split(os.sep)[2]
secret = { secret = {
'devices': lambda pk: Secret( 'devices': lambda pk: Secret(
object_id=pk, object_id=pk,
content_type=ContentType.objects.get(app_label='dcim',model='device') content_type=ContentType.objects.get(app_label='dcim', model='device')
) )
}[object](pk) }[object](pk)
session_key = get_session_key(request) session_key = get_session_key(request)