Merge pull request #2309 from WikiWatershed/jcw/fix-gis-data-serializ…

…ation-2

Fix gis_data serialization

src/mmw/apps/modeling/migrations/0023_fix_gis_data_serialization.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import ast
+import json
+
+from django.db import migrations
+
+
+def fix_gis_data_serialization(apps, schema_editor):
+    Project = apps.get_model('modeling', 'Project')
+    for project in Project.objects.filter(gis_data__startswith='{u'):
+        project.gis_data = json.dumps(ast.literal_eval(project.gis_data))
+        project.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('modeling', '0022_project_wkaoi'),
+    ]
+
+    operations = [
+         migrations.RunPython(fix_gis_data_serialization,
+                              migrations.RunPython.noop)
+    ]

src/mmw/apps/modeling/serializers.py

@@ -40,7 +40,7 @@ class Meta:
         geo_field = 'area_of_interest'
 
     user = UserSerializer(default=serializers.CurrentUserDefault())
-    gis_data = JsonField()
+    gis_data = JsonField(required=False, allow_null=True)
     scenarios = ScenarioSerializer(many=True, read_only=True)
 
 
@@ -61,3 +61,4 @@ class Meta:
 
     user = UserSerializer(default=serializers.CurrentUserDefault(),
                           read_only=True)
+    gis_data = JsonField(required=False, allow_null=True)