From 5aa189afdd8a8f7342df6c147838f0b53d7f3cfd Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Thu, 4 Aug 2011 11:05:30 +0000 Subject: [PATCH] Use BrokenForeignKey for some of the broken foreign keys in the old proceeding models - Legacy-Id: 3281 --- ietf/proceedings/models.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py index 158dc3cf0..050e0024a 100644 --- a/ietf/proceedings/models.py +++ b/ietf/proceedings/models.py @@ -3,6 +3,7 @@ from django.db import models from django.conf import settings from ietf.idtracker.models import Acronym, PersonOrOrgInfo, IRTF, AreaGroup, Area, IETFWG +from ietf.utils.broken_foreign_key import BrokenForeignKey import datetime #from ietf.utils import log @@ -188,7 +189,7 @@ class NonSessionRef(models.Model): class NonSession(models.Model): non_session_id = models.AutoField(primary_key=True) - day_id = models.IntegerField(blank=True, null=True) + day_id = models.IntegerField(blank=True, null=True) # NULL means all days non_session_ref = models.ForeignKey(NonSessionRef) meeting = models.ForeignKey(Meeting, db_column='meeting_num') time_desc = models.CharField(blank=True, max_length=75) @@ -363,18 +364,18 @@ class WgMeetingSession(models.Model, ResolveAcronym): ts_status_id = models.IntegerField(null=True, blank=True) requested_date = models.DateField(null=True, blank=True) approved_date = models.DateField(null=True, blank=True) - requested_by = models.ForeignKey(PersonOrOrgInfo, db_column='requested_by') + requested_by = BrokenForeignKey(PersonOrOrgInfo, db_column='requested_by', null=True, null_values=(0, 888888)) scheduled_date = models.DateField(null=True, blank=True) last_modified_date = models.DateField(null=True, blank=True) ad_comments = models.TextField(blank=True,null=True) sched_room_id1 = models.ForeignKey(MeetingRoom, db_column='sched_room_id1', null=True, blank=True, related_name='here1') - sched_time_id1 = models.ForeignKey(MeetingTime, db_column='sched_time_id1', null=True, blank=True, related_name='now1') + sched_time_id1 = BrokenForeignKey(MeetingTime, db_column='sched_time_id1', null=True, blank=True, related_name='now1') sched_date1 = models.DateField(null=True, blank=True) sched_room_id2 = models.ForeignKey(MeetingRoom, db_column='sched_room_id2', null=True, blank=True, related_name='here2') - sched_time_id2 = models.ForeignKey(MeetingTime, db_column='sched_time_id2', null=True, blank=True, related_name='now2') + sched_time_id2 = BrokenForeignKey(MeetingTime, db_column='sched_time_id2', null=True, blank=True, related_name='now2') sched_date2 = models.DateField(null=True, blank=True) sched_room_id3 = models.ForeignKey(MeetingRoom, db_column='sched_room_id3', null=True, blank=True, related_name='here3') - sched_time_id3 = models.ForeignKey(MeetingTime, db_column='sched_time_id3', null=True, blank=True, related_name='now3') + sched_time_id3 = BrokenForeignKey(MeetingTime, db_column='sched_time_id3', null=True, blank=True, related_name='now3') sched_date3 = models.DateField(null=True, blank=True) special_agenda_note = models.CharField(blank=True, max_length=255) combined_room_id1 = models.ForeignKey(MeetingRoom, db_column='combined_room_id1', null=True, blank=True, related_name='here4')