diff --git a/ietf/community/models.py b/ietf/community/models.py index e138ac97d..ec8e10f6e 100644 --- a/ietf/community/models.py +++ b/ietf/community/models.py @@ -6,7 +6,7 @@ from django.urls import reverse as urlreverse from ietf.doc.models import Document, DocEvent, State from ietf.group.models import Group from ietf.person.models import Person, Email -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey class CommunityList(models.Model): user = ForeignKey(User, blank=True, null=True) diff --git a/ietf/dbtemplate/models.py b/ietf/dbtemplate/models.py index 58db65a71..1c860a4a6 100644 --- a/ietf/dbtemplate/models.py +++ b/ietf/dbtemplate/models.py @@ -2,7 +2,7 @@ from django.db import models from ietf.group.models import Group from ietf.name.models import DBTemplateTypeName -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey TEMPLATE_TYPES = ( diff --git a/ietf/doc/models.py b/ietf/doc/models.py index 8b33e3d97..843c842ca 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -27,7 +27,7 @@ from ietf.utils import log from ietf.utils.admin import admin_link from ietf.utils.validators import validate_no_control_chars from ietf.utils.mail import formataddr -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey logger = logging.getLogger('django') diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py index 2b8ac76e7..70fa386d1 100644 --- a/ietf/ipr/models.py +++ b/ietf/ipr/models.py @@ -10,7 +10,7 @@ from ietf.doc.models import DocAlias from ietf.name.models import DocRelationshipName,IprDisclosureStateName,IprLicenseTypeName,IprEventTypeName from ietf.person.models import Person from ietf.message.models import Message -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey class IprDisclosureBase(models.Model): by = ForeignKey(Person) # who was logged in, or System if nobody was logged in @@ -26,6 +26,9 @@ class IprDisclosureBase(models.Model): time = models.DateTimeField(auto_now_add=True) title = models.CharField(blank=True, max_length=255) + class Meta: + ordering = ['-time', '-id'] + def __unicode__(self): return self.title diff --git a/ietf/liaisons/models.py b/ietf/liaisons/models.py index 1e9a0845f..37c24d230 100644 --- a/ietf/liaisons/models.py +++ b/ietf/liaisons/models.py @@ -11,7 +11,7 @@ from ietf.name.models import (LiaisonStatementPurposeName, LiaisonStatementState DocRelationshipName) from ietf.doc.models import Document from ietf.group.models import Group -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey # maps (previous state id, new state id) to event type id STATE_EVENT_MAPPING = { @@ -45,6 +45,10 @@ class LiaisonStatement(models.Model): attachments = models.ManyToManyField(Document, through='LiaisonStatementAttachment', blank=True) state = ForeignKey(LiaisonStatementState, default='pending') + class Meta: + ordering = ['id'] + + def __unicode__(self): return self.title or u"" diff --git a/ietf/mailinglists/models.py b/ietf/mailinglists/models.py index 7ccc37c01..119afac74 100644 --- a/ietf/mailinglists/models.py +++ b/ietf/mailinglists/models.py @@ -6,7 +6,7 @@ from django.core.validators import validate_email from django.db import models from ietf.person.models import Person -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey class List(models.Model): name = models.CharField(max_length=32) diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 5b5611a5b..464962d63 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -27,7 +27,7 @@ from ietf.person.models import Person from ietf.utils.storage import NoLocationMigrationFileSystemStorage from ietf.utils.text import xslugify from ietf.utils.timezone import date2datetime -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey countries = pytz.country_names.items() countries.sort(lambda x,y: cmp(x[1], y[1])) diff --git a/ietf/message/models.py b/ietf/message/models.py index 68a0d103f..fc72bb520 100644 --- a/ietf/message/models.py +++ b/ietf/message/models.py @@ -9,7 +9,7 @@ from ietf.person.models import Person from ietf.group.models import Group from ietf.doc.models import Document from ietf.name.models import RoleName -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey class Message(models.Model): time = models.DateTimeField(default=datetime.datetime.now) diff --git a/ietf/name/models.py b/ietf/name/models.py index d1ccb69af..42d4bb61c 100644 --- a/ietf/name/models.py +++ b/ietf/name/models.py @@ -2,7 +2,7 @@ from django.db import models -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey class NameModel(models.Model): slug = models.CharField(max_length=32, primary_key=True) diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py index eec4dcdf0..91c946d3a 100644 --- a/ietf/nomcom/models.py +++ b/ietf/nomcom/models.py @@ -23,7 +23,7 @@ from ietf.nomcom.utils import (initialize_templates_for_group, initialize_requirements_for_position, initialize_description_for_topic, delete_nomcom_templates) -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey from ietf.utils.storage import NoLocationMigrationFileSystemStorage diff --git a/ietf/redirects/models.py b/ietf/redirects/models.py index 72529eaac..d9b7b46df 100644 --- a/ietf/redirects/models.py +++ b/ietf/redirects/models.py @@ -2,7 +2,7 @@ from django.db import models -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey class Redirect(models.Model): """Mapping of CGI script to url. The "rest" is a diff --git a/ietf/stats/models.py b/ietf/stats/models.py index 6ff904b38..ac2dfb034 100644 --- a/ietf/stats/models.py +++ b/ietf/stats/models.py @@ -7,7 +7,7 @@ import debug # pyflakes:ignore from ietf.meeting.models import Meeting from ietf.name.models import CountryName from ietf.person.models import Person -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey class AffiliationAlias(models.Model): diff --git a/ietf/submit/models.py b/ietf/submit/models.py index 8cb5a8da7..6e6b09c2d 100644 --- a/ietf/submit/models.py +++ b/ietf/submit/models.py @@ -12,7 +12,7 @@ from ietf.group.models import Group from ietf.message.models import Message from ietf.name.models import DraftSubmissionStateName, FormalLanguageName from ietf.utils.accesstoken import generate_random_key, generate_access_token -from ietf.utils.models import ForeignKey, OneToOneField +from ietf.utils.models import ForeignKey def parse_email_line(line):