Upgrade to Django 2.1 using pip-tools

Closes #88

apps/files/migrations/0005_auto_20180922_1717.py

@@ -18,10 +18,4 @@ class Migration(migrations.Migration):
             field=models.CharField(blank=True, default='', max_length=240, verbose_name='Image caption'),
             preserve_default=False,
         ),
-        migrations.AlterField(
-            model_name='imagefile',
-            name='credit',
-            field=models.CharField(blank=True, default='', max_length=240, verbose_name='Image credit'),
-            preserve_default=False,
-        ),
     ]

apps/files/migrations/0006_auto_20180928_1323.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.0.8 on 2018-09-28 13:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('files', '0005_auto_20180922_1717'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='imagefile',
+            name='credit',
+            field=models.CharField(blank=True, default='', max_length=240, verbose_name='Image credit'),
+            preserve_default=False,
+        ),
+    ]

apps/files/models.py

@@ -10,7 +10,7 @@ class BaseFile(models.Model):
         upload_to='.',
     )
     user = models.ForeignKey(
-        User, related_name='%(class)s'
+        User, related_name='%(class)s', on_delete=models.PROTECT,
     )
 
     class Meta:

apps/map/models.py

@@ -246,7 +246,7 @@ class CaseStudy(models.Model):
     # User who submitted case study
     author = models.ForeignKey(
             User,
-            models.SET_NULL,
+            on_delete=models.SET_NULL,
             blank=True,
             null=True,
             editable=False
@@ -927,7 +927,8 @@ class CaseStudy(models.Model):
         SpatialRefSys,
         null=True,
         blank=True,
-        default=4326
+        default=4326,
+        on_delete=models.PROTECT
     )
 
     # 4.3.3

apps/map/views.py

@@ -147,6 +147,7 @@ class Drafts(LoginRequiredMixin, View):
 
     def get(self, request):
         draft = self.get_object(request)
+
         if draft == None:
             return HttpResponse(status=404) # Not Found
         else:
@@ -155,13 +156,14 @@ class Drafts(LoginRequiredMixin, View):
     def put(self, request):
         # Find an existing object is there is one
         draft = self.get_object(request)
+
         if draft == None:
             # If there isn't, create a new draft...
-            draft = CaseStudyDraft(author=request.user, data=request.body)
+            draft = CaseStudyDraft(author=request.user, data=request.body.decode())
             draft.save()
             return HttpResponse(status=201) # Created
         else:
-            draft.data = request.body
+            draft.data = request.body.decode()
             draft.save()
             return HttpResponse(status=200) # OK
 

apps/profiles/urls.py

@@ -2,6 +2,8 @@ from django.conf.urls import url
 
 from . import views
 
+app_name = 'profiles'
+
 urlpatterns = [
     url(
         regex=r'^~redirect/$',
@@ -18,4 +20,4 @@ urlpatterns = [
         view=views.UserUpdateView.as_view(),
         name='update'
     ),
-]
+]

apps/profiles/views.py

@@ -1,4 +1,8 @@
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
+
 from django.views.generic import DetailView, ListView, RedirectView, UpdateView
 
 from django.contrib.auth.mixins import LoginRequiredMixin