Skip to content

Commit 0d61e27

Browse files
levkowetzlevkowetz
committed
Normalized a couple of NameModels subclasses.
 - Legacy-Id: 8460
1 parent c7bf774 commit 0d61e27

7 files changed

Lines changed: 251 additions & 42 deletions

File tree

‎ietf/name/admin.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ class DocRelationshipNameAdmin(NameAdmin):
2323
admin.site.register(SessionStatusName, NameAdmin)
2424
admin.site.register(TimeSlotTypeName, NameAdmin)
2525
admin.site.register(ConstraintName, NameAdmin)
26-
admin.site.register(NomineePositionState, NameAdmin)
27-
admin.site.register(FeedbackType, NameAdmin)
26+
admin.site.register(NomineePositionStateName, NameAdmin)
27+
admin.site.register(FeedbackTypeName, NameAdmin)
2828
admin.site.register(DBTemplateTypeName, NameAdmin)

‎ietf/name/migrations/0011_add_feedback_types.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
from south.v2 import DataMigration
22

3-
from name.models import FeedbackType
4-
3+
try:
4+
from name.models import FeedbackType
5+
except ImportError:
6+
from name.models import FeedbackTypeName as FeedbackType
57

68
class Migration(DataMigration):
79

‎ietf/name/migrations/0027_rename__feedbacktype__rename_nomineepositionstate.py‎

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
# -*- coding: utf-8 -*-
2+
from south.utils import datetime_utils as datetime
3+
from south.db import db
4+
from south.v2 import SchemaMigration
5+
from django.db import models
6+
7+
8+
class Migration(SchemaMigration):
9+
10+
def forwards(self, orm):
11+
# Renaming model 'FeedbackType'
12+
db.rename_table('name_feedbacktype', 'name_feedbacktypename')
13+
14+
# Renaming model 'NomineePositionState'
15+
db.rename_table('name_nomineepositionstate', 'name_nomineepositionstatename')
16+
17+
def backwards(self, orm):
18+
# Renaming model 'FeedbackType'
19+
db.rename_table('name_feedbacktypename', 'name_feedbacktype')
20+
21+
# Renaming model 'NomineePositionState'
22+
db.rename_table('name_nomineepositionstatename', 'name_nomineepositionstate')
23+
24+
models = {
25+
u'name.ballotpositionname': {
26+
'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'},
27+
'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
28+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
29+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
30+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
31+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
32+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
33+
},
34+
u'name.constraintname': {
35+
'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'},
36+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
37+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
38+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
39+
'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
40+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
41+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
42+
},
43+
u'name.dbtemplatetypename': {
44+
'Meta': {'ordering': "['order']", 'object_name': 'DBTemplateTypeName'},
45+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
46+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
47+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
48+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
49+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
50+
},
51+
u'name.docrelationshipname': {
52+
'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'},
53+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
54+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
55+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
56+
'revname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
57+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
58+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
59+
},
60+
u'name.docremindertypename': {
61+
'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'},
62+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
63+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
64+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
65+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
66+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
67+
},
68+
u'name.doctagname': {
69+
'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'},
70+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
71+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
72+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
73+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
74+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
75+
},
76+
u'name.doctypename': {
77+
'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'},
78+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
79+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
80+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
81+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
82+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
83+
},
84+
u'name.draftsubmissionstatename': {
85+
'Meta': {'ordering': "['order']", 'object_name': 'DraftSubmissionStateName'},
86+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
87+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
88+
'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': u"orm['name.DraftSubmissionStateName']"}),
89+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
90+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
91+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
92+
},
93+
u'name.feedbacktypename': {
94+
'Meta': {'ordering': "['order']", 'object_name': 'FeedbackTypeName'},
95+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
96+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
97+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
98+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
99+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
100+
},
101+
u'name.groupmilestonestatename': {
102+
'Meta': {'ordering': "['order']", 'object_name': 'GroupMilestoneStateName'},
103+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
104+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
105+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
106+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
107+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
108+
},
109+
u'name.groupstatename': {
110+
'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'},
111+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
112+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
113+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
114+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
115+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
116+
},
117+
u'name.grouptypename': {
118+
'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'},
119+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
120+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
121+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
122+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
123+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
124+
},
125+
u'name.intendedstdlevelname': {
126+
'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'},
127+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
128+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
129+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
130+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
131+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
132+
},
133+
u'name.liaisonstatementpurposename': {
134+
'Meta': {'ordering': "['order']", 'object_name': 'LiaisonStatementPurposeName'},
135+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
136+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
137+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
138+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
139+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
140+
},
141+
u'name.meetingtypename': {
142+
'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'},
143+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
144+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
145+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
146+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
147+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
148+
},
149+
u'name.nomineepositionstatename': {
150+
'Meta': {'ordering': "['order']", 'object_name': 'NomineePositionStateName'},
151+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
152+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
153+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
154+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
155+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
156+
},
157+
u'name.rolename': {
158+
'Meta': {'ordering': "['order']", 'object_name': 'RoleName'},
159+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
160+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
161+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
162+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
163+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
164+
},
165+
u'name.roomresourcename': {
166+
'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'},
167+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
168+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
169+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
170+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
171+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
172+
},
173+
u'name.sessionstatusname': {
174+
'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'},
175+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
176+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
177+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
178+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
179+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
180+
},
181+
u'name.stdlevelname': {
182+
'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'},
183+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
184+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
185+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
186+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
187+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
188+
},
189+
u'name.streamname': {
190+
'Meta': {'ordering': "['order']", 'object_name': 'StreamName'},
191+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
192+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
193+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
194+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
195+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
196+
},
197+
u'name.timeslottypename': {
198+
'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'},
199+
'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
200+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
201+
'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
202+
'slug': ('django.db.models.fields.CharField', [], {'max_length': '32', 'primary_key': 'True'}),
203+
'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
204+
}
205+
}
206+
207+
complete_apps = ['name']

‎ietf/nomcom/forms.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from ietf.dbtemplate.forms import DBTemplateForm
1111
from ietf.group.models import Group, Role
1212
from ietf.ietfauth.utils import role_required
13-
from ietf.name.models import RoleName, FeedbackType, NomineePositionState
13+
from ietf.name.models import RoleName, FeedbackTypeName, NomineePositionStateName
1414
from ietf.nomcom.models import ( NomCom, Nomination, Nominee, NomineePosition,
1515
Position, Feedback, ReminderDates )
1616
from ietf.nomcom.utils import (NOMINATION_RECEIPT_TEMPLATE, FEEDBACK_RECEIPT_TEMPLATE,
@@ -363,10 +363,10 @@ def save(self):
363363
# if already a nomineeposition object for a position and nominee,
364364
# update the nomineepostion of primary nominee with the state
365365
if nominee_position.state.slug == 'accepted' or primary_nominee_position.state.slug == 'accepted':
366-
primary_nominee_position.state = NomineePositionState.objects.get(slug='accepted')
366+
primary_nominee_position.state = NomineePositionStateName.objects.get(slug='accepted')
367367
primary_nominee_position.save()
368368
if nominee_position.state.slug == 'declined' and primary_nominee_position.state.slug == 'pending':
369-
primary_nominee_position.state = NomineePositionState.objects.get(slug='declined')
369+
primary_nominee_position.state = NomineePositionStateName.objects.get(slug='declined')
370370
primary_nominee_position.save()
371371
else:
372372
# It is not allowed two or more nomineeposition objects with same position and nominee
@@ -444,7 +444,7 @@ def save(self, commit=True):
444444
# Complete nomination data
445445
feedback = Feedback.objects.create(nomcom=self.nomcom,
446446
comments=comments,
447-
type=FeedbackType.objects.get(slug='nomina'),
447+
type=FeedbackTypeName.objects.get(slug='nomina'),
448448
user=self.user)
449449
feedback.positions.add(position)
450450
feedback.nominees.add(nominee)
@@ -575,7 +575,7 @@ def save(self, commit=True):
575575

576576
feedback.nomcom = self.nomcom
577577
feedback.user = self.user
578-
feedback.type = FeedbackType.objects.get(slug='comment')
578+
feedback.type = FeedbackTypeName.objects.get(slug='comment')
579579
feedback.save()
580580
feedback.positions.add(self.position)
581581
feedback.nominees.add(self.nominee)
@@ -638,7 +638,7 @@ def save(self, commit=True):
638638

639639
feedback.nomcom = self.nomcom
640640
feedback.user = self.user
641-
feedback.type = FeedbackType.objects.get(slug='questio')
641+
feedback.type = FeedbackTypeName.objects.get(slug='questio')
642642
feedback.save()
643643
self.save_m2m()
644644
feedback.nominees.add(nominee)
@@ -690,7 +690,7 @@ def clean_key(self):
690690

691691
class PendingFeedbackForm(BaseNomcomForm, forms.ModelForm):
692692

693-
type = forms.ModelChoiceField(queryset=FeedbackType.objects.all().order_by('pk'), widget=forms.RadioSelect, empty_label='Unclassified', required=False)
693+
type = forms.ModelChoiceField(queryset=FeedbackTypeName.objects.all().order_by('pk'), widget=forms.RadioSelect, empty_label='Unclassified', required=False)
694694

695695
class Meta:
696696
model = Feedback
@@ -699,8 +699,8 @@ class Meta:
699699
def __init__(self, *args, **kwargs):
700700
super(PendingFeedbackForm, self).__init__(*args, **kwargs)
701701
try:
702-
self.default_type = FeedbackType.objects.get(slug=settings.DEFAULT_FEEDBACK_TYPE)
703-
except FeedbackType.DoesNotExist:
702+
self.default_type = FeedbackTypeName.objects.get(slug=settings.DEFAULT_FEEDBACK_TYPE)
703+
except FeedbackTypeName.DoesNotExist:
704704
self.default_type = None
705705

706706
def set_nomcom(self, nomcom, user):
@@ -742,7 +742,7 @@ def __init__(self, *args, **kwargs):
742742

743743
class MutableFeedbackForm(forms.ModelForm):
744744

745-
type = forms.ModelChoiceField(queryset=FeedbackType.objects.all(), widget=forms.HiddenInput)
745+
type = forms.ModelChoiceField(queryset=FeedbackTypeName.objects.all(), widget=forms.HiddenInput)
746746

747747
class Meta:
748748
model = Feedback

‎ietf/nomcom/models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class Meta:
124124

125125
def save(self, **kwargs):
126126
if not self.pk and not self.state_id:
127-
self.state = NomineePositionState.objects.get(slug='pending')
127+
self.state = NomineePositionStateName.objects.get(slug='pending')
128128
super(NomineePosition, self).save(**kwargs)
129129

130130
def __unicode__(self):

0 commit comments

Comments
 (0)