From 5f512226a5947e01351e82d83a4a8ffe928b04f5 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 18 Sep 2018 12:53:39 +0000 Subject: [PATCH] Added a missing migration and updated nomcom.resources to match model changes. - Legacy-Id: 15465 --- .../migrations/0002_auto_20180918_0550.py | 28 +++++++++++++++++++ ietf/nomcom/resources.py | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ietf/nomcom/migrations/0002_auto_20180918_0550.py diff --git a/ietf/nomcom/migrations/0002_auto_20180918_0550.py b/ietf/nomcom/migrations/0002_auto_20180918_0550.py new file mode 100644 index 000000000..ad4b76928 --- /dev/null +++ b/ietf/nomcom/migrations/0002_auto_20180918_0550.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.15 on 2018-09-18 05:50 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations +import django.db.models.deletion +import ietf.utils.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('nomcom', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='feedback', + name='user', + field=ietf.utils.models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='nomination', + name='user', + field=ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/ietf/nomcom/resources.py b/ietf/nomcom/resources.py index c967d470f..03e74f628 100644 --- a/ietf/nomcom/resources.py +++ b/ietf/nomcom/resources.py @@ -135,7 +135,7 @@ class NominationResource(ModelResource): position = ToOneField(PositionResource, 'position') nominee = ToOneField(NomineeResource, 'nominee') comments = ToOneField(FeedbackResource, 'comments') - user = ToOneField(UserResource, 'user') + user = ToOneField(UserResource, 'user', null=True) class Meta: cache = SimpleCache() queryset = Nomination.objects.all()