Skip to content

Commit a4c08f0

Browse files
emiliosanchezemiliosanchez
committed
Add wich group of the stream is responsible of the ID. See ietf-tools#569
- Legacy-Id: 2753
1 parent 0c0ee82 commit a4c08f0

2 files changed

Lines changed: 199 additions & 1 deletion

File tree

‎ietf/ietfworkflows/migrations/0006_add_group_to_streamed_id.py‎

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
2+
from south.db import db
3+
from django.db import models
4+
from ietf.ietfworkflows.models import *
5+
6+
class Migration:
7+
8+
def forwards(self, orm):
9+
10+
# Adding field 'StreamedID.content_type'
11+
db.add_column('ietfworkflows_streamedid', 'content_type', orm['ietfworkflows.streamedid:content_type'])
12+
13+
# Adding field 'StreamedID.content_id'
14+
db.add_column('ietfworkflows_streamedid', 'content_id', orm['ietfworkflows.streamedid:content_id'])
15+
16+
17+
18+
def backwards(self, orm):
19+
20+
# Deleting field 'StreamedID.content_type'
21+
db.delete_column('ietfworkflows_streamedid', 'content_type_id')
22+
23+
# Deleting field 'StreamedID.content_id'
24+
db.delete_column('ietfworkflows_streamedid', 'content_id')
25+
26+
27+
28+
models = {
29+
'contenttypes.contenttype': {
30+
'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
31+
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
32+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33+
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
34+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
35+
},
36+
'idtracker.acronym': {
37+
'Meta': {'db_table': "'acronym'"},
38+
'acronym': ('django.db.models.fields.CharField', [], {'max_length': '12'}),
39+
'acronym_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
40+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
41+
'name_key': ('django.db.models.fields.CharField', [], {'max_length': '50'})
42+
},
43+
'idtracker.idintendedstatus': {
44+
'Meta': {'db_table': "'id_intended_status'"},
45+
'intended_status': ('django.db.models.fields.CharField', [], {'max_length': '25', 'db_column': "'status_value'"}),
46+
'intended_status_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
47+
},
48+
'idtracker.idstatus': {
49+
'Meta': {'db_table': "'id_status'"},
50+
'status': ('django.db.models.fields.CharField', [], {'max_length': '25', 'db_column': "'status_value'"}),
51+
'status_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
52+
},
53+
'idtracker.internetdraft': {
54+
'Meta': {'db_table': "'internet_drafts'"},
55+
'abstract': ('django.db.models.fields.TextField', [], {}),
56+
'b_approve_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
57+
'b_discussion_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
58+
'b_sent_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
59+
'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
60+
'dunn_sent_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
61+
'expiration_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
62+
'expired_tombstone': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
63+
'extension_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
64+
'file_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
65+
'filename': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
66+
'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.Acronym']", 'db_column': "'group_acronym_id'"}),
67+
'id_document_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
68+
'id_document_tag': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
69+
'intended_status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.IDIntendedStatus']"}),
70+
'last_modified_date': ('django.db.models.fields.DateField', [], {}),
71+
'lc_changes': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True'}),
72+
'lc_expiration_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
73+
'lc_sent_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
74+
'local_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
75+
'replaced_by': ('django.db.models.fields.related.ForeignKey', ["orm['idtracker.InternetDraft']"], {'related_name': "'replaces_set'", 'null': 'True', 'db_column': "'replaced_by'", 'blank': 'True'}),
76+
'review_by_rfc_editor': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
77+
'revision': ('django.db.models.fields.CharField', [], {'max_length': '2'}),
78+
'revision_date': ('django.db.models.fields.DateField', [], {}),
79+
'rfc_number': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
80+
'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.PersonOrOrgInfo']", 'null': 'True', 'blank': 'True'}),
81+
'start_date': ('django.db.models.fields.DateField', [], {}),
82+
'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.IDStatus']"}),
83+
'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_column': "'id_document_name'"}),
84+
'txt_page_count': ('django.db.models.fields.IntegerField', [], {}),
85+
'wgreturn_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'})
86+
},
87+
'idtracker.personororginfo': {
88+
'Meta': {'db_table': "'person_or_org_info'"},
89+
'address_type': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
90+
'created_by': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'}),
91+
'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
92+
'date_modified': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
93+
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
94+
'first_name_key': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
95+
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
96+
'last_name_key': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
97+
'middle_initial': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
98+
'middle_initial_key': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
99+
'modified_by': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'}),
100+
'name_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
101+
'name_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
102+
'person_or_org_tag': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
103+
'record_type': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'})
104+
},
105+
'ietfworkflows.annotationtag': {
106+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
107+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
108+
'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['permissions.Permission']", 'null': 'True', 'blank': 'True'}),
109+
'workflow': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'annotation_tags'", 'to': "orm['workflows.Workflow']"})
110+
},
111+
'ietfworkflows.annotationtagobjectrelation': {
112+
'annotation_tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ietfworkflows.AnnotationTag']"}),
113+
'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
114+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'annotation_tags'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
115+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
116+
},
117+
'ietfworkflows.objectannotationtaghistoryentry': {
118+
'change_date': ('django.db.models.fields.DateTimeField', [], {}),
119+
'comment': ('django.db.models.fields.TextField', [], {}),
120+
'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
121+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'annotation_tags_history'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
122+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
123+
'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.PersonOrOrgInfo']"}),
124+
'setted': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
125+
'unsetted': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
126+
},
127+
'ietfworkflows.objectworkflowhistoryentry': {
128+
'comment': ('django.db.models.fields.TextField', [], {}),
129+
'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
130+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'workflow_history'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
131+
'from_state': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
132+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
133+
'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.PersonOrOrgInfo']"}),
134+
'to_state': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
135+
'transition_date': ('django.db.models.fields.DateTimeField', [], {})
136+
},
137+
'ietfworkflows.stateobjectrelationmetadata': {
138+
'estimated_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
139+
'from_date': ('django.db.models.fields.DateTimeField', [], {}),
140+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
141+
'relation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['workflows.StateObjectRelation']"})
142+
},
143+
'ietfworkflows.stream': {
144+
'group_chair_model': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
145+
'group_model': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
146+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
147+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
148+
'with_groups': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
149+
'workflow': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ietfworkflows.WGWorkflow']"})
150+
},
151+
'ietfworkflows.streamedid': {
152+
'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
153+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'streamed_id'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
154+
'draft': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['idtracker.InternetDraft']", 'unique': 'True'}),
155+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
156+
'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ietfworkflows.Stream']"})
157+
},
158+
'ietfworkflows.wgworkflow': {
159+
'selected_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['workflows.State']", 'null': 'True', 'blank': 'True'}),
160+
'selected_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ietfworkflows.AnnotationTag']", 'null': 'True', 'blank': 'True'}),
161+
'workflow_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['workflows.Workflow']", 'unique': 'True', 'primary_key': 'True'})
162+
},
163+
'permissions.permission': {
164+
'codename': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
165+
'content_types': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}),
166+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
167+
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
168+
},
169+
'workflows.state': {
170+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
171+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
172+
'transitions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['workflows.Transition']", 'null': 'True', 'blank': 'True'}),
173+
'workflow': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'states'", 'to': "orm['workflows.Workflow']"})
174+
},
175+
'workflows.stateobjectrelation': {
176+
'Meta': {'unique_together': "(('content_type', 'content_id', 'state'),)"},
177+
'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
178+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'state_object'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
179+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
180+
'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['workflows.State']"})
181+
},
182+
'workflows.transition': {
183+
'condition': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
184+
'destination': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'destination_state'", 'null': 'True', 'to': "orm['workflows.State']"}),
185+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
186+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
187+
'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['permissions.Permission']", 'null': 'True', 'blank': 'True'}),
188+
'workflow': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transitions'", 'to': "orm['workflows.Workflow']"})
189+
},
190+
'workflows.workflow': {
191+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
192+
'initial_state': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'workflow_state'", 'null': 'True', 'to': "orm['workflows.State']"}),
193+
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
194+
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['permissions.Permission']", 'symmetrical': 'False'})
195+
}
196+
}
197+
198+
complete_apps = ['ietfworkflows']

‎ietf/ietfworkflows/models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ class StreamedID(models.Model):
7979
draft = models.OneToOneField(InternetDraft)
8080
stream = models.ForeignKey(Stream)
8181

82-
content_type = models.ForeignKey(ContentType, verbose_name=_(u"Content type"), related_name="annotation_tags_history", blank=True, null=True)
82+
content_type = models.ForeignKey(ContentType, verbose_name=_(u"Content type"), related_name="streamed_id", blank=True, null=True)
8383
content_id = models.PositiveIntegerField(_(u"Content id"), blank=True, null=True)
8484
group = generic.GenericForeignKey(ct_field="content_type", fk_field="content_id")

0 commit comments

Comments
 (0)