Skip to content

Commit

Permalink
Merge 6e9ea58 into 4efe4f1
Browse files Browse the repository at this point in the history
  • Loading branch information
robinvd committed Dec 3, 2019
2 parents 4efe4f1 + 6e9ea58 commit fe56eac
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
20 changes: 20 additions & 0 deletions cms/migrations/0023_auto_20191203_1029.py
@@ -0,0 +1,20 @@
# Generated by Django 2.2.6 on 2019-12-03 09:29

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('cms', '0022_auto_20180620_1551'),
]

operations = [
migrations.AlterField(
model_name='pageuser',
name='created_by',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='created_users', to=settings.AUTH_USER_MODEL),
),
]
2 changes: 1 addition & 1 deletion cms/models/permissionmodels.py
Expand Up @@ -262,7 +262,7 @@ class PageUserManager(UserManager):
class PageUser(User):
"""Cms specific user data, required for permission system
"""
created_by = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="created_users")
created_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL, related_name="created_users")

objects = PageUserManager()

Expand Down

0 comments on commit fe56eac

Please sign in to comment.