From db6d662dfa367dd46f4a5ed92cc475634ce905d6 Mon Sep 17 00:00:00 2001 From: Gabriel Gadelha Date: Wed, 17 Jul 2019 14:30:50 -0300 Subject: [PATCH 1/2] Specify the user model using the AUTH_USER_MODEL setting Specify the user model using the AUTH_USER_MODEL setting as discussed in the Docs. https://docs.djangoproject.com/en/dev/topics/auth/customizing/#referencing-the-user-model --- app/models/plugin_datum.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/plugin_datum.py b/app/models/plugin_datum.py index 8c55045e..22e2b443 100644 --- a/app/models/plugin_datum.py +++ b/app/models/plugin_datum.py @@ -1,13 +1,13 @@ import logging from django.db import models from django.contrib.postgres import fields -from django.contrib.auth.models import User +from django.conf import settings logger = logging.getLogger('app.logger') class PluginDatum(models.Model): key = models.CharField(max_length=255, help_text="Setting key", db_index=True) - user = models.ForeignKey(User, null=True, default=None, on_delete=models.CASCADE, help_text="The user this setting belongs to. If NULL, the setting is global.") + user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, default=None, on_delete=models.CASCADE, help_text="The user this setting belongs to. If NULL, the setting is global.") int_value = models.IntegerField(blank=True, null=True, default=None, help_text="Integer value") float_value = models.FloatField(blank=True, null=True, default=None, help_text="Float value") bool_value = models.NullBooleanField(blank=True, null=True, default=None, help_text="Bool value") From 9750310576e6292e2bcef90c41d82d18205f395f Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Wed, 17 Jul 2019 14:24:54 -0400 Subject: [PATCH 2/2] use settings.AUTH_USER_MODEL instead of User in foreign keys --- app/models/preset.py | 4 ++-- app/models/project.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/preset.py b/app/models/preset.py index 03d7772c..ea5fcbf7 100644 --- a/app/models/preset.py +++ b/app/models/preset.py @@ -1,6 +1,6 @@ import logging -from django.contrib.auth.models import User +from django.conf import settings from django.contrib.postgres.fields import JSONField from django.db import models from django.utils import timezone @@ -10,7 +10,7 @@ logger = logging.getLogger('app.logger') class Preset(models.Model): - owner = models.ForeignKey(User, blank=True, null=True, on_delete=models.CASCADE, help_text="The person who owns this preset") + owner = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, on_delete=models.CASCADE, help_text="The person who owns this preset") name = models.CharField(max_length=255, blank=False, null=False, help_text="A label used to describe the preset") options = JSONField(default=list, blank=True, help_text="Options that define this preset (same format as in a Task's options).", validators=[validate_task_options]) diff --git a/app/models/project.py b/app/models/project.py index 0b488d6f..f8b6944f 100644 --- a/app/models/project.py +++ b/app/models/project.py @@ -1,6 +1,6 @@ import logging -from django.contrib.auth.models import User +from django.conf import settings from django.db import models from django.db.models import Q from django.db.models import signals @@ -18,7 +18,7 @@ logger = logging.getLogger('app.logger') class Project(models.Model): - owner = models.ForeignKey(User, on_delete=models.PROTECT, help_text="The person who created the project") + owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT, help_text="The person who created the project") name = models.CharField(max_length=255, help_text="A label used to describe the project") description = models.TextField(default="", blank=True, help_text="More in-depth description of the project") created_at = models.DateTimeField(default=timezone.now, help_text="Creation date")