Skip to content

Commit 2d5569c

Browse files
committed
Fix autofield warning messages
Changes to be committed: modified: api/admin.py modified: api/apps.py modified: api/models.py modified: api/signals.py modified: bco_api/settings.py
1 parent 12182ff commit 2d5569c

File tree

5 files changed

+27
-26
lines changed

5 files changed

+27
-26
lines changed

bco_api/api/admin.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env python3
12
"""Django Admin
23
34
Registers models for the Django Admin app
@@ -6,8 +7,10 @@
67
from django.contrib import admin
78
from guardian.admin import GuardedModelAdmin
89
from api.models import bco, prefix_table, new_users, Prefix
10+
from api.groups import GroupInfo
911

1012
admin.site.register(bco, GuardedModelAdmin)
1113
admin.site.register(prefix_table)
1214
admin.site.register(new_users)
15+
admin.site.register(GroupInfo)
1316
admin.site.register(Prefix)

bco_api/api/apps.py

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
# Run code after start-up
2-
# TODO: move things from settings.py into here.
3-
# Source: https://stackoverflow.com/a/42744626/5029459
4-
# Source: https://docs.djangoproject.com/en/3.2/ref/applications/#django.apps.AppConfig.ready
1+
#!/usr/bin/env python3
2+
"""Run code after start-up
3+
TODO: move things from settings.py into here.
4+
Source: https://stackoverflow.com/a/42744626/5029459
5+
Source: https://docs.djangoproject.com/en/3.2/ref/applications/#django.apps.AppConfig.ready
6+
"""
57

68
from django.apps import AppConfig
79
from django.db.models.signals import post_migrate
10+
from api.signals import populate_models
811

12+
class ApiConfig(AppConfig):
13+
"""API Configuration
14+
"""
915

10-
class ApiConfig(
11-
AppConfig
12-
):
16+
default_auto_field = 'django.db.models.AutoField'
1317
name = 'api'
1418

15-
def ready(
16-
self
17-
):
18-
# Create the anonymous user if they don't exist.
19-
from .signals import populate_models
20-
21-
post_migrate.connect(
22-
populate_models,
23-
sender=self
24-
)
19+
def ready(self):
20+
"""Create the anonymous user if they don't exist."""
21+
post_migrate.connect(populate_models, sender=self)

bco_api/api/models.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ class new_users(models.Model):
114114
created = models.DateTimeField(default=timezone.now)
115115

116116

117-
# Link Prefix to groups and users.
118-
119-
# Be careful about related_name.
120-
# Source: https://stackoverflow.com/questions/53651114/using-same-foreign-key-twice-in-a-model-in-django-as-different-fields
121117
class Prefix(models.Model):
122-
"""Which server is this prefix certified with?"""
118+
"""Link Prefix to groups and users.
119+
120+
Be careful about related_name.
121+
Source: https://stackoverflow.com/questions/53651114/using-same-foreign-key-twice-in-a-model-in-django-as-different-fields
122+
Which server is this prefix certified with?"""
123123

124124
certifying_server = models.TextField(blank = True, null = True)
125125

@@ -159,10 +159,10 @@ class Prefix(models.Model):
159159

160160
# The actual prefix.
161161
prefix = models.CharField(max_length=5)
162-
162+
163163
def __str__(self):
164164
"""String for representing the BCO model (in Admin site etc.)."""
165-
return "{}".format(self.prefix)
165+
return f"{self.prefix}"
166166

167167
# def get_first_name(self):
168168
# return self.first_name

bco_api/api/signals.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def populate_models(sender, **kwargs):
7676

7777
DbUtils.DbUtils().write_object(
7878
p_app_label = 'api',
79-
p_model_name = 'prefixes',
79+
p_model_name = 'Prefix',
8080
p_fields = ['created_by', 'owner_group', 'owner_user', 'prefix'],
8181
p_data = {
8282
'created_by': user,
@@ -129,7 +129,7 @@ def populate_models(sender, **kwargs):
129129
name = 'prefix_admins'
130130
).permissions.add(
131131
Permission.objects.get(
132-
codename = perm + '_prefixes'
132+
codename = perm + '_prefix'
133133
)
134134
)
135135

bco_api/bco_api/settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,3 +260,4 @@
260260
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
261261
EMAIL_HOST = 'localhost'
262262
EMAIL_PORT = 25
263+
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'

0 commit comments

Comments
 (0)