From 172189a90be8ed05b7ac9812bd14d750a5b71d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Mon, 12 Jun 2017 16:59:57 +0200 Subject: [PATCH] ChangeSet author can be null --- src/c3nav/editor/migrations/0001_initial.py | 4 ++-- src/c3nav/editor/models.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/c3nav/editor/migrations/0001_initial.py b/src/c3nav/editor/migrations/0001_initial.py index 5f374b8b..ee860e7b 100644 --- a/src/c3nav/editor/migrations/0001_initial.py +++ b/src/c3nav/editor/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2017-06-12 12:50 +# Generated by Django 1.11.2 on 2017-06-12 14:59 from __future__ import unicode_literals from django.conf import settings @@ -42,7 +42,7 @@ class Migration(migrations.Migration): ('proposed', models.DateTimeField(null=True, verbose_name='proposed')), ('applied', models.DateTimeField(null=True, verbose_name='applied')), ('applied_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='applied_changesets', to=settings.AUTH_USER_MODEL, verbose_name='applied by')), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='changesets', to=settings.AUTH_USER_MODEL, verbose_name='Author')), + ('author', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='changesets', to=settings.AUTH_USER_MODEL, verbose_name='Author')), ], options={ 'verbose_name': 'Change Set', diff --git a/src/c3nav/editor/models.py b/src/c3nav/editor/models.py index e87da4db..ee41049f 100644 --- a/src/c3nav/editor/models.py +++ b/src/c3nav/editor/models.py @@ -4,12 +4,13 @@ from django.apps import apps from django.conf import settings from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.db import models +from django.db.models import Q from django.utils.translation import ugettext_lazy as _ class ChangeSet(models.Model): - author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT, verbose_name=_('Author')) created = models.DateTimeField(auto_now_add=True, verbose_name=_('created')) + author = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, verbose_name=_('Author')) proposed = models.DateTimeField(null=True, verbose_name=_('proposed')) applied = models.DateTimeField(null=True, verbose_name=_('applied')) applied_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT,