Skip to content

Commit 0c0ee82

Browse files
emiliosanchezemiliosanchez
committed
Added models for basic stream configuration. See ietf-tools#569
- Legacy-Id: 2752
1 parent b09a27b commit 0c0ee82

3 files changed

Lines changed: 233 additions & 1 deletion

File tree

‎ietf/ietfworkflows/admin.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.contrib import admin
22

3-
from ietf.ietfworkflows.models import AnnotationTag, WGWorkflow
3+
from ietf.ietfworkflows.models import (AnnotationTag, WGWorkflow,
4+
Stream)
45
from workflows.admin import StateInline
56

67
class AnnotationTagInline(admin.TabularInline):
@@ -9,4 +10,6 @@ class AnnotationTagInline(admin.TabularInline):
910
class IETFWorkflowAdmin(admin.ModelAdmin):
1011
inlines = [StateInline, AnnotationTagInline]
1112

13+
1214
admin.site.register(WGWorkflow, IETFWorkflowAdmin)
15+
admin.site.register(Stream, admin.ModelAdmin)

‎ietf/ietfworkflows/migrations/0005_add_streams.py‎

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

‎ietf/ietfworkflows/models.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,23 @@ class WGWorkflow(Workflow):
6262
class Meta:
6363
verbose_name = 'IETF Workflow'
6464
verbose_name_plural = 'IETF Workflows'
65+
66+
67+
class Stream(models.Model):
68+
name = models.CharField(_(u"Name"), max_length=100)
69+
with_groups = models.BooleanField(_(u'With groups'), default=False)
70+
group_model = models.CharField(_(u'Group model'), max_length=100, blank=True, null=True)
71+
group_chair_model = models.CharField(_(u'Group chair model'), max_length=100, blank=True, null=True)
72+
workflow = models.ForeignKey(WGWorkflow)
73+
74+
def __unicode__(self):
75+
return u'%s stream' % self.name
76+
77+
78+
class StreamedID(models.Model):
79+
draft = models.OneToOneField(InternetDraft)
80+
stream = models.ForeignKey(Stream)
81+
82+
content_type = models.ForeignKey(ContentType, verbose_name=_(u"Content type"), related_name="annotation_tags_history", blank=True, null=True)
83+
content_id = models.PositiveIntegerField(_(u"Content id"), blank=True, null=True)
84+
group = generic.GenericForeignKey(ct_field="content_type", fk_field="content_id")

0 commit comments

Comments
 (0)