Fixes migration for apps still using South. Move the content_map fiel…

…d to the appropriate model
GeoNode · Jan 30, 2018 · 9d6e211 · 9d6e211
1 parent da6fde2
commit 9d6e211
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 103 deletions.
diff --git a/geonode/contrib/worldmap/gazetteer/migrations/0001_initial.py b/geonode/contrib/worldmap/gazetteer/migrations/0001_initial.py
@@ -1,63 +1,38 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-
-        # Adding model 'GazetteerEntry'
-        db.create_table('gazetteer_gazetteerentry', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('layer_name', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('layer_attribute', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('feature_type', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('feature_fid', self.gf('django.db.models.fields.BigIntegerField')()),
-            ('latitude', self.gf('django.db.models.fields.FloatField')()),
-            ('longitude', self.gf('django.db.models.fields.FloatField')()),
-            ('place_name', self.gf('django.db.models.fields.TextField')()),
-            ('start_date', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('end_date', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('julian_start', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
-            ('julian_end', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
-            ('project', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('feature', self.gf('django.contrib.gis.db.models.fields.GeometryField')(null=True, blank=True)),
-        ))
-        db.send_create_signal('gazetteer', ['GazetteerEntry'])
-
-        # Adding unique constraint on 'GazetteerEntry', fields ['layer_name', 'layer_attribute', 'feature_fid']
-        db.create_unique('gazetteer_gazetteerentry', ['layer_name', 'layer_attribute', 'feature_fid'])
-
-
-    def backwards(self, orm):
-
-        # Removing unique constraint on 'GazetteerEntry', fields ['layer_name', 'layer_attribute', 'feature_fid']
-        db.delete_unique('gazetteer_gazetteerentry', ['layer_name', 'layer_attribute', 'feature_fid'])
-
-        # Deleting model 'GazetteerEntry'
-        db.delete_table('gazetteer_gazetteerentry')
-
-
-    models = {
-        'gazetteer.gazetteerentry': {
-            'Meta': {'unique_together': "(('layer_name', 'layer_attribute', 'feature_fid'),)", 'object_name': 'GazetteerEntry'},
-            'end_date': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'feature': ('django.contrib.gis.db.models.fields.GeometryField', [], {'null': 'True', 'blank': 'True'}),
-            'feature_fid': ('django.db.models.fields.BigIntegerField', [], {}),
-            'feature_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'julian_end': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'julian_start': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'latitude': ('django.db.models.fields.FloatField', [], {}),
-            'layer_attribute': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'layer_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'longitude': ('django.db.models.fields.FloatField', [], {}),
-            'place_name': ('django.db.models.fields.TextField', [], {}),
-            'project': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['gazetteer']
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.contrib.gis.db.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GazetteerEntry',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('layer_name', models.CharField(max_length=255, verbose_name='Layer Name')),
+                ('layer_attribute', models.CharField(max_length=255, verbose_name='Layer Attribute')),
+                ('feature_type', models.CharField(max_length=255, verbose_name='Feature Type')),
+                ('feature_fid', models.BigIntegerField(verbose_name='Feature FID')),
+                ('latitude', models.FloatField(verbose_name='Latitude')),
+                ('longitude', models.FloatField(verbose_name='Longitude')),
+                ('place_name', models.TextField(verbose_name='Place name')),
+                ('start_date', models.TextField(null=True, verbose_name='Start Date', blank=True)),
+                ('end_date', models.TextField(null=True, verbose_name='End Date', blank=True)),
+                ('julian_start', models.IntegerField(null=True, verbose_name='Julian Date Start', blank=True)),
+                ('julian_end', models.IntegerField(null=True, verbose_name='Julian Date End', blank=True)),
+                ('project', models.CharField(max_length=255, null=True, verbose_name='Project', blank=True)),
+                ('feature', django.contrib.gis.db.models.fields.GeometryField(srid=4326, null=True, verbose_name='Geometry', blank=True)),
+                ('username', models.CharField(max_length=30, null=True, verbose_name='User Name', blank=True)),
+            ],
+        ),
+        migrations.AlterUniqueTogether(
+            name='gazetteerentry',
+            unique_together=set([('layer_name', 'layer_attribute', 'feature_fid')]),
+        ),
+    ]
diff --git a/...ode/contrib/worldmap/gazetteer/migrations/0002_auto__add_field_gazetteerentry_username.py b/...ode/contrib/worldmap/gazetteer/migrations/0002_auto__add_field_gazetteerentry_username.py
diff --git a/geonode/contrib/worldmap/queue/migrations/0001_initial.py b/geonode/contrib/worldmap/queue/migrations/0001_initial.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('layers', '0029_layer_service'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GazetteerUpdateJob',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('status', models.CharField(default=b'pending', max_length=10, choices=[(b'pending', b'pending'), (b'failed', b'failed')])),
+                ('layer', models.ForeignKey(to='layers.Layer', unique=True)),
+            ],
+        ),
+    ]
diff --git a/geonode/contrib/worldmap/queue/migrations/__init__.py b/geonode/contrib/worldmap/queue/migrations/__init__.py
diff --git a/geonode/maps/migrations/0027_remove_map_content_map.py b/geonode/maps/migrations/0027_remove_map_content_map.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maps', '0026_map_content_map'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='map',
+            name='content_map',
+        ),
+    ]