Merge pull request #13 from LegoStormtroopr/develop

fix migrations for 1.5
aristotle-mdr · Mar 24, 2017 · f14e821 · f14e821
2 parents 991c14c + 690452f
commit f14e821
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 58 deletions.
diff --git a/aristotle_glossary/migrations/0001_initial.pyc b/aristotle_glossary/migrations/0001_initial.pyc
diff --git a/...totle_glossary/migrations/0001_initial.py → .../0001_squashed_0003_fix_concept_fields.py b/...totle_glossary/migrations/0001_initial.py → .../0001_squashed_0003_fix_concept_fields.py
@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
-import ckeditor.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
+    replaces = [(b'aristotle_glossary', '0001_initial'), (b'aristotle_glossary', '0002_auto_20160425_0143'), (b'aristotle_glossary', '0003_fix_concept_fields')]
+
     dependencies = [
-        ('aristotle_mdr', '0002_auto_20150409_0656'),
+        ('aristotle_mdr', '0020_add_uuids'),
     ]
 
     operations = [
@@ -18,24 +19,12 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('definition', models.TextField()),
             ],
-            options={
-            },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='GlossaryItem',
             fields=[
                 ('_concept_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='aristotle_mdr._concept')),
-                ('short_name', models.CharField(max_length=100, blank=True)),
-                ('version', models.CharField(max_length=20, blank=True)),
-                ('synonyms', models.CharField(max_length=200, blank=True)),
-                ('references', ckeditor.fields.RichTextField(blank=True)),
-                ('origin_URI', models.URLField(help_text='If imported, the original location of the item', blank=True)),
-                ('comments', ckeditor.fields.RichTextField(help_text='Descriptive comments about the metadata item.', blank=True)),
-                ('submitting_organisation', models.CharField(max_length=256, blank=True)),
-                ('responsible_organisation', models.CharField(max_length=256, blank=True)),
                 ('index', models.ManyToManyField(related_name='related_glossary_items', null=True, to='aristotle_mdr._concept', blank=True)),
-                ('superseded_by', models.ForeignKey(related_name='supersedes', blank=True, to='aristotle_glossary.GlossaryItem', null=True)),
             ],
             options={
                 'abstract': False,
@@ -46,13 +35,11 @@ class Migration(migrations.Migration):
             model_name='glossaryadditionaldefinition',
             name='glossaryItem',
             field=models.ForeignKey(related_name='alternate_definitions', to='aristotle_glossary.GlossaryItem'),
-            preserve_default=True,
         ),
         migrations.AddField(
             model_name='glossaryadditionaldefinition',
             name='registrationAuthority',
             field=models.ForeignKey(to='aristotle_mdr.RegistrationAuthority'),
-            preserve_default=True,
         ),
         migrations.AlterUniqueTogether(
             name='glossaryadditionaldefinition',

diff --git a/aristotle_glossary/migrations/0002_auto_20160425_0143.py b/aristotle_glossary/migrations/0002_auto_20160425_0143.py
diff --git a/aristotle_glossary/migrations/0003_fix_concept_fields.py b/aristotle_glossary/migrations/0003_fix_concept_fields.py
diff --git a/aristotle_glossary/migrations/__init__.pyc b/aristotle_glossary/migrations/__init__.pyc