Fix up doc migration which included too much in the initial migration compared to trunk.

 - Legacy-Id: 4295

Author: OleLaursen

ietf/doc/migrations/0001_initial.py

@@ -60,10 +60,10 @@ def forwards(self, orm):
             ('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
             ('stream', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.StreamName'], null=True, blank=True)),
             ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['group.Group'], null=True, blank=True)),
-            ('abstract', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('abstract', self.gf('django.db.models.fields.TextField')()),
             ('rev', self.gf('django.db.models.fields.CharField')(max_length=16, blank=True)),
             ('pages', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
-            ('order', self.gf('django.db.models.fields.IntegerField')(default=1, blank=True)),
+            ('order', self.gf('django.db.models.fields.IntegerField')(default=1)),
             ('intended_std_level', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.IntendedStdLevelName'], null=True, blank=True)),
             ('std_level', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.StdLevelName'], null=True, blank=True)),
             ('ad', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='ad_document_set', null=True, to=orm['person.Person'])),
@@ -119,10 +119,10 @@ def forwards(self, orm):
             ('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
             ('stream', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.StreamName'], null=True, blank=True)),
             ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['group.Group'], null=True, blank=True)),
-            ('abstract', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('abstract', self.gf('django.db.models.fields.TextField')()),
             ('rev', self.gf('django.db.models.fields.CharField')(max_length=16, blank=True)),
             ('pages', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
-            ('order', self.gf('django.db.models.fields.IntegerField')(default=1, blank=True)),
+            ('order', self.gf('django.db.models.fields.IntegerField')(default=1)),
             ('intended_std_level', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.IntendedStdLevelName'], null=True, blank=True)),
             ('std_level', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.StdLevelName'], null=True, blank=True)),
             ('ad', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='ad_dochistory_set', null=True, to=orm['person.Person'])),
@@ -189,25 +189,6 @@ def forwards(self, orm):
         ))
         db.send_create_signal('doc', ['NewRevisionDocEvent'])
 
-        # Adding model 'BallotType'
-        db.create_table('doc_ballottype', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('doc_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.DocTypeName'], null=True, blank=True)),
-            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50, db_index=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('question', self.gf('django.db.models.fields.TextField')(blank=True)),
-            ('used', self.gf('django.db.models.fields.BooleanField')(default=True)),
-            ('order', self.gf('django.db.models.fields.IntegerField')(default=0)),
-        ))
-        db.send_create_signal('doc', ['BallotType'])
-
-        # Adding model 'BallotDocEvent'
-        db.create_table('doc_ballotdocevent', (
-            ('docevent_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['doc.DocEvent'], unique=True, primary_key=True)),
-            ('ballot_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['doc.BallotType'])),
-        ))
-        db.send_create_signal('doc', ['BallotDocEvent'])
-
         # Adding model 'BallotPositionDocEvent'
         db.create_table('doc_ballotpositiondocevent', (
             ('docevent_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['doc.DocEvent'], unique=True, primary_key=True)),
@@ -315,12 +296,6 @@ def backwards(self, orm):
         # Deleting model 'NewRevisionDocEvent'
         db.delete_table('doc_newrevisiondocevent')
 
-        # Deleting model 'BallotType'
-        db.delete_table('doc_ballottype')
-
-        # Deleting model 'BallotDocEvent'
-        db.delete_table('doc_ballotdocevent')
-
         # Deleting model 'BallotPositionDocEvent'
         db.delete_table('doc_ballotpositiondocevent')
 
@@ -377,11 +352,6 @@ def backwards(self, orm):
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
         },
-        'doc.ballotdocevent': {
-            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'BallotDocEvent', '_ormbases': ['doc.DocEvent']},
-            'ballot_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.BallotType']"}),
-            'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'})
-        },
         'doc.ballotpositiondocevent': {
             'Meta': {'ordering': "['-time', '-id']", 'object_name': 'BallotPositionDocEvent', '_ormbases': ['doc.DocEvent']},
             'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}),
@@ -392,16 +362,6 @@ def backwards(self, orm):
             'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}),
             'pos': ('django.db.models.fields.related.ForeignKey', [], {'default': "'norecord'", 'to': "orm['name.BallotPositionName']"})
         },
-        'doc.ballottype': {
-            'Meta': {'ordering': "['order']", 'object_name': 'BallotType'},
-            'doc_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'question': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'}),
-            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
-        },
         'doc.docalias': {
             'Meta': {'object_name': 'DocAlias'},
             'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}),
@@ -419,7 +379,7 @@ def backwards(self, orm):
         },
         'doc.dochistory': {
             'Meta': {'object_name': 'DocHistory'},
-            'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'abstract': ('django.db.models.fields.TextField', [], {}),
             'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_dochistory_set'", 'null': 'True', 'to': "orm['person.Person']"}),
             'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocHistoryAuthor']", 'blank': 'True'}),
             'doc': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'history_set'", 'to': "orm['doc.Document']"}),
@@ -432,7 +392,7 @@ def backwards(self, orm):
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
             'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
             'related': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.DocAlias']", 'symmetrical': 'False', 'through': "orm['doc.RelatedDocHistory']", 'blank': 'True'}),
             'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}),
@@ -462,7 +422,7 @@ def backwards(self, orm):
         },
         'doc.document': {
             'Meta': {'object_name': 'Document'},
-            'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'abstract': ('django.db.models.fields.TextField', [], {}),
             'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': "orm['person.Person']"}),
             'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocumentAuthor']", 'blank': 'True'}),
             'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
@@ -473,7 +433,7 @@ def backwards(self, orm):
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}),
             'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
             'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
             'related': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'reversely_related_document_set'", 'blank': 'True', 'through': "orm['doc.RelatedDocument']", 'to': "orm['doc.DocAlias']"}),
             'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}),
@@ -561,7 +521,7 @@ def backwards(self, orm):
         },
         'group.group': {
             'Meta': {'object_name': 'Group'},
-            'acronym': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
+            'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
             'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}),
             'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': "orm['doc.Document']"}),
             'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
@@ -574,18 +534,16 @@ def backwards(self, orm):
             'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupStateName']", 'null': 'True'}),
             'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupTypeName']", 'null': 'True'}),
-            'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False'}),
-            'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTagName']", 'symmetrical': 'False'})
+            'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}),
+            'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'})
         },
         'name.ballotpositionname': {
             'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'},
-            'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
             'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
-            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'valid_document_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTypeName']", 'symmetrical': 'False', 'blank': 'True'})
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
         },
         'name.docrelationshipname': {
             'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'},

…d_field_ballotpositiondocevent_ballot.py …vent__add_ballottype__add_ballotdocev.pyietf/doc/migrations/0002_auto__add_field_ballotpositiondocevent_ballot.py renamed to ietf/doc/migrations/0002_auto__del_groupballotpositiondocevent__add_ballottype__add_ballotdocev.py ietf/doc/migrations/0002_auto__add_field_ballotpositiondocevent_ballot.py renamed to ietf/doc/migrations/0002_auto__del_groupballotpositiondocevent__add_ballottype__add_ballotdocev.py

@@ -8,6 +8,21 @@ class Migration(SchemaMigration):
 
     def forwards(self, orm):
 
+        # Deleting model 'GroupBallotPositionDocEvent'
+        db.delete_table('doc_groupballotpositiondocevent')
+
+        # Adding model 'BallotType'
+        db.create_table('doc_ballottype', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('doc_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.DocTypeName'], null=True, blank=True)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50, db_index=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('question', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('used', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('order', self.gf('django.db.models.fields.IntegerField')(default=0)),
+        ))
+        db.send_create_signal('doc', ['BallotType'])
+
         # Adding M2M table for field positions on 'BallotType'
         db.create_table('doc_ballottype_positions', (
             ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
@@ -16,15 +31,40 @@ def forwards(self, orm):
         ))
         db.create_unique('doc_ballottype_positions', ['ballottype_id', 'ballotpositionname_id'])
 
+        # Adding model 'BallotDocEvent'
+        db.create_table('doc_ballotdocevent', (
+            ('docevent_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['doc.DocEvent'], unique=True, primary_key=True)),
+            ('ballot_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['doc.BallotType'])),
+        ))
+        db.send_create_signal('doc', ['BallotDocEvent'])
+
         # Adding field 'BallotPositionDocEvent.ballot'
         db.add_column('doc_ballotpositiondocevent', 'ballot', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['doc.BallotDocEvent'], null=True), keep_default=False)
 
 
     def backwards(self, orm):
 
+        # Adding model 'GroupBallotPositionDocEvent'
+        db.create_table('doc_groupballotpositiondocevent', (
+            ('block_comment', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('comment', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('ad', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['person.Person'])),
+            ('comment_time', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+            ('block_comment_time', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+            ('pos', self.gf('django.db.models.fields.related.ForeignKey')(default='norecord', to=orm['name.GroupBallotPositionName'])),
+            ('docevent_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['doc.DocEvent'], unique=True, primary_key=True)),
+        ))
+        db.send_create_signal('doc', ['GroupBallotPositionDocEvent'])
+
+        # Deleting model 'BallotType'
+        db.delete_table('doc_ballottype')
+
         # Removing M2M table for field positions on 'BallotType'
         db.delete_table('doc_ballottype_positions')
 
+        # Deleting model 'BallotDocEvent'
+        db.delete_table('doc_ballotdocevent')
+
         # Deleting field 'BallotPositionDocEvent.ballot'
         db.delete_column('doc_ballotpositiondocevent', 'ballot_id')
 
@@ -184,16 +224,6 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'order': ('django.db.models.fields.IntegerField', [], {'default': '1'})
         },
-        'doc.groupballotpositiondocevent': {
-            'Meta': {'ordering': "['-time', '-id']", 'object_name': 'GroupBallotPositionDocEvent', '_ormbases': ['doc.DocEvent']},
-            'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}),
-            'block_comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'block_comment_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'comment_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}),
-            'pos': ('django.db.models.fields.related.ForeignKey', [], {'default': "'norecord'", 'to': "orm['name.GroupBallotPositionName']"})
-        },
         'doc.initialreviewdocevent': {
             'Meta': {'ordering': "['-time', '-id']", 'object_name': 'InitialReviewDocEvent', '_ormbases': ['doc.DocEvent']},
             'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}),
@@ -275,8 +305,7 @@ def backwards(self, orm):
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
             'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
-            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'valid_document_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTypeName']", 'symmetrical': 'False', 'blank': 'True'})
+            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
         },
         'name.docrelationshipname': {
             'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'},
@@ -310,14 +339,6 @@ def backwards(self, orm):
             'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
             'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
         },
-        'name.groupballotpositionname': {
-            'Meta': {'ordering': "['order']", 'object_name': 'GroupBallotPositionName'},
-            'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}),
-            'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
-        },
         'name.groupstatename': {
             'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'},
             'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}),