Normalized the naming of a couple of NameModel subclasses.

- Legacy-Id: 8458

ietf/name/models.py

@@ -60,9 +60,9 @@ class ConstraintName(NameModel):
     penalty = models.IntegerField(default=0, help_text="The penalty for violating this kind of constraint; for instance 10 (small penalty) or 10000 (large penalty)")
 class LiaisonStatementPurposeName(NameModel):
     """For action, For comment, For information, In response, Other"""
-class NomineePositionState(NameModel):
+class NomineePositionStateName(NameModel):
     """Status of a candidate for a position: None, Accepted, Declined"""
-class FeedbackType(NameModel):
+class FeedbackTypeName(NameModel):
     """Type of feedback: questionnaires, nominations, comments"""
 class DBTemplateTypeName(NameModel):
     """reStructuredText, Plain, Django"""

ietf/nomcom/models.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8-No-BOM -*-
 import os
 
 from django.db import models
@@ -13,7 +13,7 @@ from south.modelsinspector import add_introspection_rules
 from ietf.nomcom.fields import EncryptedTextField
 from ietf.person.models import Email
 from ietf.group.models import Group
-from ietf.name.models import NomineePositionState, FeedbackType
+from ietf.name.models import NomineePositionStateName, FeedbackTypeName
 from ietf.dbtemplate.models import DBTemplate
 
 from ietf.nomcom.managers import NomineePositionManager, NomineeManager, \
@@ -111,7 +111,7 @@ class NomineePosition(models.Model):
 
     position = models.ForeignKey('Position')
     nominee = models.ForeignKey('Nominee')
-    state = models.ForeignKey(NomineePositionState)
+    state = models.ForeignKey(NomineePositionStateName)
     time = models.DateTimeField(auto_now_add=True)
 
     objects = NomineePositionManager()
@@ -187,7 +187,7 @@ class Feedback(models.Model):
     nominees = models.ManyToManyField('Nominee', blank=True, null=True)
     subject = models.TextField(verbose_name='Subject', blank=True)
     comments = EncryptedTextField(verbose_name='Comments')
-    type = models.ForeignKey(FeedbackType, blank=True, null=True)
+    type = models.ForeignKey(FeedbackTypeName, blank=True, null=True)
     user = models.ForeignKey(User, editable=False, blank=True, null=True)
     time = models.DateTimeField(auto_now_add=True)