2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

ChangeSet author can be null

Browse source
This commit is contained in:
Laura Klünder 2017-06-12 16:59:57 +02:00
parent 2770628315
commit 172189a90b
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/c3nav/editor/migrations/0001_initial.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- 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 __future__ import unicode_literals
from django.conf import settings from django.conf import settings
@ -42,7 +42,7 @@ class Migration(migrations.Migration):
('proposed', models.DateTimeField(null=True, verbose_name='proposed')), ('proposed', models.DateTimeField(null=True, verbose_name='proposed')),
('applied', models.DateTimeField(null=True, verbose_name='applied')), ('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')), ('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={ options={
'verbose_name': 'Change Set', 'verbose_name': 'Change Set',

3
src/c3nav/editor/models.py
View file

@ -4,12 +4,13 @@ from django.apps import apps
from django.conf import settings from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.db import models from django.db import models
from django.db.models import Q
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
class ChangeSet(models.Model): 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')) 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')) proposed = models.DateTimeField(null=True, verbose_name=_('proposed'))
applied = models.DateTimeField(null=True, verbose_name=_('applied')) applied = models.DateTimeField(null=True, verbose_name=_('applied'))
applied_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, applied_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT,