Try to clean south mess-up...

2 files changed, 143 insertions, 15 deletions

diff --git a/chimere/migrations/0038_osm_import_filtr.py b/chimere/migrations/0047_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
index 2b8666b..4b40fb9 100644
--- a/chimere/migrations/0038_osm_import_filtr.py
+++ b/chimere/migrations/0047_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
@@ -1,24 +1,37 @@
 # -*- coding: utf-8 -*-
 import datetime
 from south.db import db
-from south.v2 import DataMigration
+from south.v2 import SchemaMigration
 from django.db import models
 
-class Migration(DataMigration):
+
+class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        for importer in orm['chimere.Importer'].objects.filter(
-                                           importer_type='OSM').all():
-            if importer.filtr:
-                continue
-            splited_url = importer.source.split('/')
-            importer.filtr = splited_url[-1]
-            importer.source = "/".join(splited_url[:-1])+"/"
-            importer.save()
+        # Adding unique constraint on 'Area', fields ['order']
+        db.create_unique('chimere_area', ['order'])
+
+        # Adding field 'Importer.associate_marker_to_way'
+        db.add_column('chimere_importer', 'associate_marker_to_way',
+                      self.gf('django.db.models.fields.BooleanField')(default=True),
+                      keep_default=False)
+
+        # Adding field 'Route.has_associated_marker'
+        db.add_column('chimere_route', 'has_associated_marker',
+                      self.gf('django.db.models.fields.BooleanField')(default=True),
+                      keep_default=False)
+
 
     def backwards(self, orm):
-        # no backward necessary
-        pass
+        # Removing unique constraint on 'Area', fields ['order']
+        db.delete_unique('chimere_area', ['order'])
+
+        # Deleting field 'Importer.associate_marker_to_way'
+        db.delete_column('chimere_importer', 'associate_marker_to_way')
+
+        # Deleting field 'Route.has_associated_marker'
+        db.delete_column('chimere_route', 'has_associated_marker')
+
 
     models = {
         'chimere.area': {
@@ -77,7 +90,7 @@ class Migration(DataMigration):
         },
         'chimere.importer': {
             'Meta': {'object_name': 'Importer'},
-            'associate_marker_to_way': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'associate_marker_to_way': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
             'default_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
             'filtr': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
@@ -235,5 +248,4 @@ class Migration(DataMigration):
         }
     }
 
-    complete_apps = ['chimere']
-    symmetrical = True
+    complete_apps = ['chimere']
\ No newline at end of file
diff --git a/chimere/migrations/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py b/chimere/migrations/0048_auto__add_propertymodelchoice__add_multimediaextension__add_page__chg_.py
index 0b26a27..e58c6b0 100644
--- a/chimere/migrations/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py
+++ b/chimere/migrations/0048_auto__add_propertymodelchoice__add_multimediaextension__add_page__chg_.py
@@ -8,6 +8,15 @@ from django.db import models
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
+        # Adding model 'PropertyModelChoice'
+        db.create_table('chimere_propertymodelchoice', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('propertymodel', self.gf('django.db.models.fields.related.ForeignKey')(related_name='choices', to=orm['chimere.PropertyModel'])),
+            ('value', self.gf('django.db.models.fields.CharField')(max_length=150)),
+            ('available', self.gf('django.db.models.fields.BooleanField')(default=True)),
+        ))
+        db.send_create_signal('chimere', ['PropertyModelChoice'])
+
         # Adding model 'MultimediaExtension'
         db.create_table('chimere_multimediaextension', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@@ -16,17 +25,99 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal('chimere', ['MultimediaExtension'])
 
+        # Adding model 'Page'
+        db.create_table('chimere_page', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=150)),
+            ('mnemonic', self.gf('django.db.models.fields.CharField')(max_length=10, null=True, blank=True)),
+            ('available', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('order', self.gf('django.db.models.fields.IntegerField')(default=10, null=True, blank=True)),
+            ('template_path', self.gf('django.db.models.fields.CharField')(max_length=150, null=True, blank=True)),
+            ('content', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+        ))
+        db.send_create_signal('chimere', ['Page'])
+
 
         # Changing field 'MultimediaFile.multimedia_type'
         db.alter_column('chimere_multimediafile', 'multimedia_type_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['chimere.MultimediaType'], null=True))
+        # Adding field 'SubCategory.dated'
+        db.add_column('chimere_subcategory', 'dated',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+        # Adding field 'SubCategory.description'
+        db.add_column('chimere_subcategory', 'description',
+                      self.gf('django.db.models.fields.TextField')(null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'SubCategory.hover_icon'
+        db.add_column('chimere_subcategory', 'hover_icon',
+                      self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='subcat_hovered', null=True, to=orm['chimere.Icon']),
+                      keep_default=False)
+
+        # Adding field 'SubCategory.as_layer'
+        db.add_column('chimere_subcategory', 'as_layer',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+        # Adding field 'SubCategory.routing_warn'
+        db.add_column('chimere_subcategory', 'routing_warn',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+        # Adding field 'News.is_front_page'
+        db.add_column('chimere_news', 'is_front_page',
+                      self.gf('django.db.models.fields.NullBooleanField')(null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'News.url'
+        db.add_column('chimere_news', 'url',
+                      self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'Marker.is_front_page'
+        db.add_column('chimere_marker', 'is_front_page',
+                      self.gf('django.db.models.fields.NullBooleanField')(null=True, blank=True),
+                      keep_default=False)
+
 
     def backwards(self, orm):
+        # Deleting model 'PropertyModelChoice'
+        db.delete_table('chimere_propertymodelchoice')
+
         # Deleting model 'MultimediaExtension'
         db.delete_table('chimere_multimediaextension')
 
+        # Deleting model 'Page'
+        db.delete_table('chimere_page')
+
 
         # User chose to not deal with backwards NULL issues for 'MultimediaFile.multimedia_type'
         raise RuntimeError("Cannot reverse this migration. 'MultimediaFile.multimedia_type' and its values cannot be restored.")
+        # Deleting field 'SubCategory.dated'
+        db.delete_column('chimere_subcategory', 'dated')
+
+        # Deleting field 'SubCategory.description'
+        db.delete_column('chimere_subcategory', 'description')
+
+        # Deleting field 'SubCategory.hover_icon'
+        db.delete_column('chimere_subcategory', 'hover_icon_id')
+
+        # Deleting field 'SubCategory.as_layer'
+        db.delete_column('chimere_subcategory', 'as_layer')
+
+        # Deleting field 'SubCategory.routing_warn'
+        db.delete_column('chimere_subcategory', 'routing_warn')
+
+        # Deleting field 'News.is_front_page'
+        db.delete_column('chimere_news', 'is_front_page')
+
+        # Deleting field 'News.url'
+        db.delete_column('chimere_news', 'url')
+
+        # Deleting field 'Marker.is_front_page'
+        db.delete_column('chimere_marker', 'is_front_page')
+
 
     models = {
         'chimere.area': {
@@ -115,6 +206,7 @@ class Migration(SchemaMigration):
             'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
             'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
             'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'is_front_page': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
             'license': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
             'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
@@ -162,6 +254,18 @@ class Migration(SchemaMigration):
             'content': ('django.db.models.fields.TextField', [], {}),
             'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_front_page': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'chimere.page': {
+            'Meta': {'object_name': 'Page'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mnemonic': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '10', 'null': 'True', 'blank': 'True'}),
+            'template_path': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
         },
         'chimere.picturefile': {
@@ -195,6 +299,13 @@ class Migration(SchemaMigration):
             'subcategories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'properties'", 'blank': 'True', 'to': "orm['chimere.SubCategory']"}),
             'type': ('django.db.models.fields.CharField', [], {'max_length': '1'})
         },
+        'chimere.propertymodelchoice': {
+            'Meta': {'object_name': 'PropertyModelChoice'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'propertymodel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'choices'", 'to': "orm['chimere.PropertyModel']"}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
         'chimere.route': {
             'Meta': {'ordering': "('status', 'name')", 'object_name': 'Route'},
             'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.RouteFile']", 'null': 'True', 'blank': 'True'}),
@@ -232,14 +343,19 @@ class Migration(SchemaMigration):
         },
         'chimere.subcategory': {
             'Meta': {'ordering': "['category', 'order']", 'object_name': 'SubCategory'},
+            'as_layer': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'subcategories'", 'to': "orm['chimere.Category']"}),
             'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']", 'null': 'True', 'blank': 'True'}),
+            'dated': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hover_icon': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'subcat_hovered'", 'null': 'True', 'to': "orm['chimere.Icon']"}),
             'icon': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Icon']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'item_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
             'order': ('django.db.models.fields.IntegerField', [], {'default': '1000'}),
+            'routing_warn': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'submission': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
         },
         'chimere.tinyurl': {