diff --git a/apps/api/views.py b/apps/api/views.py index 56f6ee5..7a11d64 100644 --- a/apps/api/views.py +++ b/apps/api/views.py @@ -1,9 +1,11 @@ from django.contrib.auth.models import User -from rest_framework import serializers, viewsets +from rest_framework import serializers +from rest_framework import viewsets from rest_framework_gis import serializers as gis_serializers from apps.files.models import File -from apps.map.models import CaseStudy, PointOfInterest +from apps.map.models import CaseStudy +from apps.map.models import PointOfInterest class UserSerializer(serializers.HyperlinkedModelSerializer): diff --git a/apps/contact/forms.py b/apps/contact/forms.py index c709cb0..3f9d3a1 100644 --- a/apps/contact/forms.py +++ b/apps/contact/forms.py @@ -1,6 +1,6 @@ -from envelope.forms import ContactForm from crispy_forms.helper import FormHelper from crispy_forms.layout import Submit +from envelope.forms import ContactForm class ContactForm(ContactForm): diff --git a/apps/contact/tests.py b/apps/contact/tests.py index a79ca8b..601fc86 100644 --- a/apps/contact/tests.py +++ b/apps/contact/tests.py @@ -1,3 +1,2 @@ # from django.test import TestCase - # Create your tests here. diff --git a/apps/contact/views.py b/apps/contact/views.py index 3a22659..8333dd9 100644 --- a/apps/contact/views.py +++ b/apps/contact/views.py @@ -1,7 +1,6 @@ from braces.views import FormMessagesMixin -from envelope.views import ContactView - from django.utils.translation import ugettext_lazy as _ +from envelope.views import ContactView from .forms import ContactForm diff --git a/apps/files/forms.py b/apps/files/forms.py index ea76ea6..344c883 100644 --- a/apps/files/forms.py +++ b/apps/files/forms.py @@ -1,6 +1,7 @@ from django import forms -from .models import File, ImageFile +from .models import File +from .models import ImageFile class FileForm(forms.ModelForm): diff --git a/apps/files/migrations/0001_initial.py b/apps/files/migrations/0001_initial.py index 592d441..7acc52e 100644 --- a/apps/files/migrations/0001_initial.py +++ b/apps/files/migrations/0001_initial.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-04-23 02:20 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/files/migrations/0002_file_user.py b/apps/files/migrations/0002_file_user.py index 71be947..cf39a62 100644 --- a/apps/files/migrations/0002_file_user.py +++ b/apps/files/migrations/0002_file_user.py @@ -2,9 +2,10 @@ # Generated by Django 1.11.6 on 2018-04-29 22:07 from __future__ import unicode_literals -from django.conf import settings -from django.db import migrations, models import django.db.models.deletion +from django.conf import settings +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/files/migrations/0003_auto_20180526_1547.py b/apps/files/migrations/0003_auto_20180526_1547.py index 740db9a..cf1a7e9 100644 --- a/apps/files/migrations/0003_auto_20180526_1547.py +++ b/apps/files/migrations/0003_auto_20180526_1547.py @@ -2,9 +2,10 @@ # Generated by Django 1.11.6 on 2018-05-26 15:47 from __future__ import unicode_literals -from django.conf import settings -from django.db import migrations, models import django.db.models.deletion +from django.conf import settings +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/files/migrations/0004_auto_20180530_0308.py b/apps/files/migrations/0004_auto_20180530_0308.py index d2a6298..84cab67 100644 --- a/apps/files/migrations/0004_auto_20180530_0308.py +++ b/apps/files/migrations/0004_auto_20180530_0308.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-05-30 03:08 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/files/migrations/0005_auto_20180922_1717.py b/apps/files/migrations/0005_auto_20180922_1717.py index 62bd9d2..0cfecf7 100644 --- a/apps/files/migrations/0005_auto_20180922_1717.py +++ b/apps/files/migrations/0005_auto_20180922_1717.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.15 on 2018-09-22 17:17 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/files/migrations/0006_auto_20180928_1323.py b/apps/files/migrations/0006_auto_20180928_1323.py index 94771c4..cbd7bdd 100644 --- a/apps/files/migrations/0006_auto_20180928_1323.py +++ b/apps/files/migrations/0006_auto_20180928_1323.py @@ -1,6 +1,6 @@ # Generated by Django 2.0.8 on 2018-09-28 13:23 - -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/files/migrations/0007_auto_20181201_2315.py b/apps/files/migrations/0007_auto_20181201_2315.py index cc42842..8c6a996 100644 --- a/apps/files/migrations/0007_auto_20181201_2315.py +++ b/apps/files/migrations/0007_auto_20181201_2315.py @@ -1,8 +1,8 @@ # Generated by Django 2.1.1 on 2018-12-01 23:15 - -from django.conf import settings -from django.db import migrations, models import django.db.models.deletion +from django.conf import settings +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/files/tests.py b/apps/files/tests.py index 0120cb3..d00f0e3 100644 --- a/apps/files/tests.py +++ b/apps/files/tests.py @@ -1,9 +1,8 @@ from django.contrib.auth.models import User from django.http import QueryDict from django.test import TestCase -from django.utils.translation import activate from django.urls import reverse - +from django.utils.translation import activate from override_storage import override_storage from .models import File diff --git a/apps/files/urls.py b/apps/files/urls.py index ca608ed..0de410a 100644 --- a/apps/files/urls.py +++ b/apps/files/urls.py @@ -1,11 +1,9 @@ from django.conf.urls import url -from .views import ( - FileUploadView, - FileDeleteView, - ImageFileUploadView, - ImageFileDeleteView, -) +from .views import FileDeleteView +from .views import FileUploadView +from .views import ImageFileDeleteView +from .views import ImageFileUploadView app_name = "files" diff --git a/apps/files/views.py b/apps/files/views.py index ff7c621..24c925a 100644 --- a/apps/files/views.py +++ b/apps/files/views.py @@ -1,10 +1,13 @@ -from django.core.exceptions import PermissionDenied from django.contrib.auth.mixins import LoginRequiredMixin +from django.core.exceptions import PermissionDenied from django.http import JsonResponse -from django.views.generic import FormView, DetailView +from django.views.generic import DetailView +from django.views.generic import FormView -from .forms import ImageFileForm, FileForm -from .models import ImageFile, File +from .forms import FileForm +from .forms import ImageFileForm +from .models import File +from .models import ImageFile class FileUploadView(LoginRequiredMixin, FormView): diff --git a/apps/map/admin.py b/apps/map/admin.py index 2deb84c..b7165ed 100644 --- a/apps/map/admin.py +++ b/apps/map/admin.py @@ -1,9 +1,12 @@ -from django.contrib import admin -from django import forms from dal import autocomplete +from django import forms +from django.contrib import admin from leaflet.admin import LeafletGeoAdmin -from .models import CaseStudy, CaseStudyDraft, SpatialRefSys, PointOfInterest +from .models import CaseStudy +from .models import CaseStudyDraft +from .models import PointOfInterest +from .models import SpatialRefSys class CaseStudyDraftAdmin(admin.ModelAdmin): diff --git a/apps/map/forms.py b/apps/map/forms.py index 58252fa..f1a4e35 100644 --- a/apps/map/forms.py +++ b/apps/map/forms.py @@ -1,19 +1,28 @@ +from crispy_forms.bootstrap import FormActions +from crispy_forms.bootstrap import PrependedText +from crispy_forms.bootstrap import Tab +from crispy_forms.bootstrap import TabHolder +from crispy_forms.helper import FormHelper +from crispy_forms.layout import Div +from crispy_forms.layout import Fieldset +from crispy_forms.layout import HTML +from crispy_forms.layout import Layout +from crispy_forms.layout import Submit +from dal import autocomplete from django import forms -from django.urls import reverse, reverse_lazy +from django.urls import reverse +from django.urls import reverse_lazy from django.utils.safestring import mark_safe from django.utils.text import format_lazy from django.utils.translation import ugettext_lazy as _ - -from crispy_forms.helper import FormHelper -from crispy_forms.layout import Submit, Layout, HTML, Fieldset, Div -from crispy_forms.bootstrap import Tab, TabHolder, PrependedText, FormActions -from dal import autocomplete from leaflet.forms.widgets import LeafletWidget -from apps.files.models import File, ImageFile - -from .models import CaseStudy, SpatialRefSys, PointOfInterest +from .models import CaseStudy +from .models import PointOfInterest +from .models import SpatialRefSys from .widgets import JSONFileListWidget +from apps.files.models import File +from apps.files.models import ImageFile SECTOR_HELP = { diff --git a/apps/map/migrations/0001_initial.py b/apps/map/migrations/0001_initial.py index d91e1e8..fce1eb6 100644 --- a/apps/map/migrations/0001_initial.py +++ b/apps/map/migrations/0001_initial.py @@ -2,11 +2,12 @@ # Generated by Django 1.11.1 on 2017-05-19 21:42 from __future__ import unicode_literals -from django.conf import settings import django.contrib.gis.db.models.fields -from django.db import migrations, models import django.db.models.deletion import django_countries.fields +from django.conf import settings +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0004_auto_20171006_1559.py b/apps/map/migrations/0004_auto_20171006_1559.py index 7b66458..1c1b0f4 100644 --- a/apps/map/migrations/0004_auto_20171006_1559.py +++ b/apps/map/migrations/0004_auto_20171006_1559.py @@ -2,7 +2,8 @@ # Generated by Django 1.10.7 on 2017-10-06 15:59 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0005_auto_20171006_2033.py b/apps/map/migrations/0005_auto_20171006_2033.py index b5c442a..25be3ab 100644 --- a/apps/map/migrations/0005_auto_20171006_2033.py +++ b/apps/map/migrations/0005_auto_20171006_2033.py @@ -2,7 +2,8 @@ # Generated by Django 1.10.7 on 2017-10-06 20:33 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0006_auto_20171007_1349.py b/apps/map/migrations/0006_auto_20171007_1349.py index 1c745b1..f8aa7cb 100644 --- a/apps/map/migrations/0006_auto_20171007_1349.py +++ b/apps/map/migrations/0006_auto_20171007_1349.py @@ -2,7 +2,8 @@ # Generated by Django 1.10.7 on 2017-10-07 13:49 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0007_casestudy_slug.py b/apps/map/migrations/0007_casestudy_slug.py index b362b0a..cad0d14 100644 --- a/apps/map/migrations/0007_casestudy_slug.py +++ b/apps/map/migrations/0007_casestudy_slug.py @@ -2,8 +2,8 @@ # Generated by Django 1.10.7 on 2017-10-07 14:23 from __future__ import unicode_literals -from django.db import migrations import django_extensions.db.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/apps/map/migrations/0008_casestudy_date_created.py b/apps/map/migrations/0008_casestudy_date_created.py index 2653c8d..989e8a5 100644 --- a/apps/map/migrations/0008_casestudy_date_created.py +++ b/apps/map/migrations/0008_casestudy_date_created.py @@ -2,7 +2,8 @@ # Generated by Django 1.10.7 on 2017-10-07 15:02 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0009_auto_20171007_1544.py b/apps/map/migrations/0009_auto_20171007_1544.py index 324dd54..9e5a05e 100644 --- a/apps/map/migrations/0009_auto_20171007_1544.py +++ b/apps/map/migrations/0009_auto_20171007_1544.py @@ -2,7 +2,8 @@ # Generated by Django 1.10.7 on 2017-10-07 15:44 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0010_auto_20171011_1606.py b/apps/map/migrations/0010_auto_20171011_1606.py index 14e5430..d6f4bc0 100644 --- a/apps/map/migrations/0010_auto_20171011_1606.py +++ b/apps/map/migrations/0010_auto_20171011_1606.py @@ -2,8 +2,10 @@ # Generated by Django 1.11.6 on 2017-10-11 16:06 from __future__ import unicode_literals +from django.db import migrations +from django.db import models + import apps.map.validators -from django.db import migrations, models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0011_casestudy_generation_technology.py b/apps/map/migrations/0011_casestudy_generation_technology.py index 5559df1..6ff6254 100644 --- a/apps/map/migrations/0011_casestudy_generation_technology.py +++ b/apps/map/migrations/0011_casestudy_generation_technology.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-10-12 15:52 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0012_auto_20171012_1610.py b/apps/map/migrations/0012_auto_20171012_1610.py index a4b5eff..408a2e2 100644 --- a/apps/map/migrations/0012_auto_20171012_1610.py +++ b/apps/map/migrations/0012_auto_20171012_1610.py @@ -3,8 +3,9 @@ from __future__ import unicode_literals import django.contrib.gis.db.models.fields -from django.db import migrations, models import django_countries.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0013_auto_20171012_1640.py b/apps/map/migrations/0013_auto_20171012_1640.py index e879548..76a9702 100644 --- a/apps/map/migrations/0013_auto_20171012_1640.py +++ b/apps/map/migrations/0013_auto_20171012_1640.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-10-12 16:40 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0014_auto_20171025_2035.py b/apps/map/migrations/0014_auto_20171025_2035.py index 87a95b8..e155fa2 100644 --- a/apps/map/migrations/0014_auto_20171025_2035.py +++ b/apps/map/migrations/0014_auto_20171025_2035.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-10-25 20:35 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0015_auto_20171030_1550.py b/apps/map/migrations/0015_auto_20171030_1550.py index 1bb73b1..6a02267 100644 --- a/apps/map/migrations/0015_auto_20171030_1550.py +++ b/apps/map/migrations/0015_auto_20171030_1550.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-10-30 15:50 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0016_auto_20171031_1442.py b/apps/map/migrations/0016_auto_20171031_1442.py index c5e8b3d..f80190a 100644 --- a/apps/map/migrations/0016_auto_20171031_1442.py +++ b/apps/map/migrations/0016_auto_20171031_1442.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-10-31 14:42 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0017_auto_20171101_1508.py b/apps/map/migrations/0017_auto_20171101_1508.py index 0b96484..85e18e7 100644 --- a/apps/map/migrations/0017_auto_20171101_1508.py +++ b/apps/map/migrations/0017_auto_20171101_1508.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-01 15:08 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0018_auto_20171102_2205.py b/apps/map/migrations/0018_auto_20171102_2205.py index 2a979a7..ee832ee 100644 --- a/apps/map/migrations/0018_auto_20171102_2205.py +++ b/apps/map/migrations/0018_auto_20171102_2205.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 22:05 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0019_casestudy_coordinate_reference_system.py b/apps/map/migrations/0019_casestudy_coordinate_reference_system.py index 0abb464..f62a908 100644 --- a/apps/map/migrations/0019_casestudy_coordinate_reference_system.py +++ b/apps/map/migrations/0019_casestudy_coordinate_reference_system.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 22:11 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0020_auto_20171102_2219.py b/apps/map/migrations/0020_auto_20171102_2219.py index 2a54927..b196ca1 100644 --- a/apps/map/migrations/0020_auto_20171102_2219.py +++ b/apps/map/migrations/0020_auto_20171102_2219.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 22:19 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0021_auto_20171102_2223.py b/apps/map/migrations/0021_auto_20171102_2223.py index 35112d0..2834ddc 100644 --- a/apps/map/migrations/0021_auto_20171102_2223.py +++ b/apps/map/migrations/0021_auto_20171102_2223.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 22:23 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0022_casestudy_projected_production_of_commodities.py b/apps/map/migrations/0022_casestudy_projected_production_of_commodities.py index a7b4bff..359dc2a 100644 --- a/apps/map/migrations/0022_casestudy_projected_production_of_commodities.py +++ b/apps/map/migrations/0022_casestudy_projected_production_of_commodities.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 22:28 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0023_auto_20171102_2232.py b/apps/map/migrations/0023_auto_20171102_2232.py index 2fe541f..98c4461 100644 --- a/apps/map/migrations/0023_auto_20171102_2232.py +++ b/apps/map/migrations/0023_auto_20171102_2232.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 22:32 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0024_auto_20171102_2250.py b/apps/map/migrations/0024_auto_20171102_2250.py index 31cf6ba..65f5265 100644 --- a/apps/map/migrations/0024_auto_20171102_2250.py +++ b/apps/map/migrations/0024_auto_20171102_2250.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 22:50 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0025_auto_20171102_2300.py b/apps/map/migrations/0025_auto_20171102_2300.py index 863e098..69da29d 100644 --- a/apps/map/migrations/0025_auto_20171102_2300.py +++ b/apps/map/migrations/0025_auto_20171102_2300.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 23:00 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0026_auto_20171102_2326.py b/apps/map/migrations/0026_auto_20171102_2326.py index 868ae73..332feec 100644 --- a/apps/map/migrations/0026_auto_20171102_2326.py +++ b/apps/map/migrations/0026_auto_20171102_2326.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 23:26 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0027_auto_20171102_2346.py b/apps/map/migrations/0027_auto_20171102_2346.py index 9cfdd09..cebd576 100644 --- a/apps/map/migrations/0027_auto_20171102_2346.py +++ b/apps/map/migrations/0027_auto_20171102_2346.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 23:46 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0028_auto_20171102_2358.py b/apps/map/migrations/0028_auto_20171102_2358.py index 1cdfbf1..6dd6f7c 100644 --- a/apps/map/migrations/0028_auto_20171102_2358.py +++ b/apps/map/migrations/0028_auto_20171102_2358.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-02 23:58 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0029_casestudy_negative_case_reasons.py b/apps/map/migrations/0029_casestudy_negative_case_reasons.py index 1336f7a..b3b781e 100644 --- a/apps/map/migrations/0029_casestudy_negative_case_reasons.py +++ b/apps/map/migrations/0029_casestudy_negative_case_reasons.py @@ -2,8 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-03 13:28 from __future__ import unicode_literals -from django.db import migrations import multiselectfield.db.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/apps/map/migrations/0030_auto_20171103_1608.py b/apps/map/migrations/0030_auto_20171103_1608.py index 68063ba..e535252 100644 --- a/apps/map/migrations/0030_auto_20171103_1608.py +++ b/apps/map/migrations/0030_auto_20171103_1608.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-03 16:08 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0031_auto_20171103_1610.py b/apps/map/migrations/0031_auto_20171103_1610.py index 970ed8f..ae9307d 100644 --- a/apps/map/migrations/0031_auto_20171103_1610.py +++ b/apps/map/migrations/0031_auto_20171103_1610.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-03 16:10 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0032_auto_20171103_1745.py b/apps/map/migrations/0032_auto_20171103_1745.py index 990a98a..15f3f18 100644 --- a/apps/map/migrations/0032_auto_20171103_1745.py +++ b/apps/map/migrations/0032_auto_20171103_1745.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-03 17:45 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0033_auto_20171103_2230.py b/apps/map/migrations/0033_auto_20171103_2230.py index 2662224..bb24f73 100644 --- a/apps/map/migrations/0033_auto_20171103_2230.py +++ b/apps/map/migrations/0033_auto_20171103_2230.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-03 22:30 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0034_auto_20171103_2254.py b/apps/map/migrations/0034_auto_20171103_2254.py index 87303ad..5f0ede0 100644 --- a/apps/map/migrations/0034_auto_20171103_2254.py +++ b/apps/map/migrations/0034_auto_20171103_2254.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2017-11-03 22:54 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0035_auto_20180326_0157.py b/apps/map/migrations/0035_auto_20180326_0157.py index 1797e2d..0bbecfa 100644 --- a/apps/map/migrations/0035_auto_20180326_0157.py +++ b/apps/map/migrations/0035_auto_20180326_0157.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-26 01:57 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0036_auto_20180327_0334.py b/apps/map/migrations/0036_auto_20180327_0334.py index 76f00b4..343e3da 100644 --- a/apps/map/migrations/0036_auto_20180327_0334.py +++ b/apps/map/migrations/0036_auto_20180327_0334.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-27 03:34 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0037_auto_20180327_0549.py b/apps/map/migrations/0037_auto_20180327_0549.py index b3a43d5..ce45a54 100644 --- a/apps/map/migrations/0037_auto_20180327_0549.py +++ b/apps/map/migrations/0037_auto_20180327_0549.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-27 05:49 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0038_auto_20180328_0146.py b/apps/map/migrations/0038_auto_20180328_0146.py index 6ae3053..c3a5def 100644 --- a/apps/map/migrations/0038_auto_20180328_0146.py +++ b/apps/map/migrations/0038_auto_20180328_0146.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-28 01:46 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0039_auto_20180328_0245.py b/apps/map/migrations/0039_auto_20180328_0245.py index c223b8d..c89f845 100644 --- a/apps/map/migrations/0039_auto_20180328_0245.py +++ b/apps/map/migrations/0039_auto_20180328_0245.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-28 02:45 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0040_auto_20180328_0309.py b/apps/map/migrations/0040_auto_20180328_0309.py index 9c6f9a0..4430644 100644 --- a/apps/map/migrations/0040_auto_20180328_0309.py +++ b/apps/map/migrations/0040_auto_20180328_0309.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-28 03:09 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0041_auto_20180328_0616.py b/apps/map/migrations/0041_auto_20180328_0616.py index eef74b3..abc3f3e 100644 --- a/apps/map/migrations/0041_auto_20180328_0616.py +++ b/apps/map/migrations/0041_auto_20180328_0616.py @@ -2,8 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-28 06:16 from __future__ import unicode_literals -from django.db import migrations import multiselectfield.db.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/apps/map/migrations/0042_auto_20180328_1122.py b/apps/map/migrations/0042_auto_20180328_1122.py index b526ff1..f7ec2ec 100644 --- a/apps/map/migrations/0042_auto_20180328_1122.py +++ b/apps/map/migrations/0042_auto_20180328_1122.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-28 11:22 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0043_auto_20180329_1044.py b/apps/map/migrations/0043_auto_20180329_1044.py index 799275f..30eb5e4 100644 --- a/apps/map/migrations/0043_auto_20180329_1044.py +++ b/apps/map/migrations/0043_auto_20180329_1044.py @@ -2,9 +2,11 @@ # Generated by Django 1.11.6 on 2018-03-29 10:44 from __future__ import unicode_literals -import apps.map.validators -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models + +import apps.map.validators class Migration(migrations.Migration): diff --git a/apps/map/migrations/0044_auto_20180331.py b/apps/map/migrations/0044_auto_20180331.py index a43b1c8..fe4325f 100644 --- a/apps/map/migrations/0044_auto_20180331.py +++ b/apps/map/migrations/0044_auto_20180331.py @@ -2,8 +2,9 @@ # Generated by Django 1.11.6 on 2018-03-31 04:59 from __future__ import unicode_literals -from django.db import migrations, models import phonenumber_field.modelfields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0045_auto_20180331_0517.py b/apps/map/migrations/0045_auto_20180331_0517.py index 5f30249..c770562 100644 --- a/apps/map/migrations/0045_auto_20180331_0517.py +++ b/apps/map/migrations/0045_auto_20180331_0517.py @@ -2,8 +2,9 @@ # Generated by Django 1.11.6 on 2018-03-31 05:17 from __future__ import unicode_literals -from django.db import migrations, models import phonenumber_field.modelfields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0046_auto_20180331_0604.py b/apps/map/migrations/0046_auto_20180331_0604.py index 83a3020..6a6091b 100644 --- a/apps/map/migrations/0046_auto_20180331_0604.py +++ b/apps/map/migrations/0046_auto_20180331_0604.py @@ -2,8 +2,10 @@ # Generated by Django 1.11.6 on 2018-03-31 06:04 from __future__ import unicode_literals +from django.db import migrations +from django.db import models + import apps.map.validators -from django.db import migrations, models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0047_auto_20180331_0607.py b/apps/map/migrations/0047_auto_20180331_0607.py index 01e574f..66e8d2e 100644 --- a/apps/map/migrations/0047_auto_20180331_0607.py +++ b/apps/map/migrations/0047_auto_20180331_0607.py @@ -2,8 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-31 06:08 from __future__ import unicode_literals -from django.db import migrations import multiselectfield.db.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/apps/map/migrations/0048_auto_20180331_0933.py b/apps/map/migrations/0048_auto_20180331_0933.py index d473505..2cbc1e0 100644 --- a/apps/map/migrations/0048_auto_20180331_0933.py +++ b/apps/map/migrations/0048_auto_20180331_0933.py @@ -2,8 +2,9 @@ # Generated by Django 1.11.6 on 2018-03-31 09:33 from __future__ import unicode_literals -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0049_auto_20180331_1134.py b/apps/map/migrations/0049_auto_20180331_1134.py index 7a2b497..7a632da 100644 --- a/apps/map/migrations/0049_auto_20180331_1134.py +++ b/apps/map/migrations/0049_auto_20180331_1134.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-03-31 11:34 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0050_auto_20180402_1237.py b/apps/map/migrations/0050_auto_20180402_1237.py index fe5f9e6..febba2e 100644 --- a/apps/map/migrations/0050_auto_20180402_1237.py +++ b/apps/map/migrations/0050_auto_20180402_1237.py @@ -2,8 +2,8 @@ # Generated by Django 1.11.6 on 2018-04-02 12:37 from __future__ import unicode_literals -from django.db import migrations import multiselectfield.db.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/apps/map/migrations/0051_auto_20180404_2215.py b/apps/map/migrations/0051_auto_20180404_2215.py index eea12bd..6ad6b3a 100644 --- a/apps/map/migrations/0051_auto_20180404_2215.py +++ b/apps/map/migrations/0051_auto_20180404_2215.py @@ -3,8 +3,9 @@ from __future__ import unicode_literals import django.contrib.gis.db.models.fields -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0052_auto_20180412_0647.py b/apps/map/migrations/0052_auto_20180412_0647.py index 7400f27..49289ab 100644 --- a/apps/map/migrations/0052_auto_20180412_0647.py +++ b/apps/map/migrations/0052_auto_20180412_0647.py @@ -3,9 +3,10 @@ from __future__ import unicode_literals import django.contrib.gis.db.models.fields -from django.db import migrations, models import django_countries.fields import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0053_casestudydraft.py b/apps/map/migrations/0053_casestudydraft.py index 0b0a930..0cf1440 100644 --- a/apps/map/migrations/0053_casestudydraft.py +++ b/apps/map/migrations/0053_casestudydraft.py @@ -2,9 +2,10 @@ # Generated by Django 1.11.6 on 2018-04-12 06:50 from __future__ import unicode_literals -from django.conf import settings -from django.db import migrations, models import django.db.models.deletion +from django.conf import settings +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0054_auto_20180416_0355.py b/apps/map/migrations/0054_auto_20180416_0355.py index 08d1a44..ebc9e8f 100644 --- a/apps/map/migrations/0054_auto_20180416_0355.py +++ b/apps/map/migrations/0054_auto_20180416_0355.py @@ -2,10 +2,11 @@ # Generated by Django 1.11.6 on 2018-04-16 03:55 from __future__ import unicode_literals -from django.conf import settings import django.contrib.gis.db.models.fields -from django.db import migrations, models import django.db.models.deletion +from django.conf import settings +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0055_auto_20180419_1650.py b/apps/map/migrations/0055_auto_20180419_1650.py index 7fec4b9..5af0bb0 100644 --- a/apps/map/migrations/0055_auto_20180419_1650.py +++ b/apps/map/migrations/0055_auto_20180419_1650.py @@ -2,8 +2,9 @@ # Generated by Django 1.11.6 on 2018-04-19 16:50 from __future__ import unicode_literals -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0057_auto_20180423_0220.py b/apps/map/migrations/0057_auto_20180423_0220.py index 2b7fd9b..ca5eaf4 100644 --- a/apps/map/migrations/0057_auto_20180423_0220.py +++ b/apps/map/migrations/0057_auto_20180423_0220.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-04-23 02:20 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0058_auto_20180429_2205.py b/apps/map/migrations/0058_auto_20180429_2205.py index ce1889f..dafb7a9 100644 --- a/apps/map/migrations/0058_auto_20180429_2205.py +++ b/apps/map/migrations/0058_auto_20180429_2205.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-04-29 22:05 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0059_auto_20180519_1801.py b/apps/map/migrations/0059_auto_20180519_1801.py index b60253c..58edc92 100644 --- a/apps/map/migrations/0059_auto_20180519_1801.py +++ b/apps/map/migrations/0059_auto_20180519_1801.py @@ -2,8 +2,9 @@ # Generated by Django 1.11.6 on 2018-05-19 18:01 from __future__ import unicode_literals -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0061_auto_20180523_1659.py b/apps/map/migrations/0061_auto_20180523_1659.py index 9667a48..fd98a32 100644 --- a/apps/map/migrations/0061_auto_20180523_1659.py +++ b/apps/map/migrations/0061_auto_20180523_1659.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-05-23 16:59 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0062_auto_20180525_0035.py b/apps/map/migrations/0062_auto_20180525_0035.py index 61be8a7..448f7a7 100644 --- a/apps/map/migrations/0062_auto_20180525_0035.py +++ b/apps/map/migrations/0062_auto_20180525_0035.py @@ -2,8 +2,9 @@ # Generated by Django 1.11.6 on 2018-05-25 00:35 from __future__ import unicode_literals -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0063_auto_20180525_0052.py b/apps/map/migrations/0063_auto_20180525_0052.py index 5924895..68a7225 100644 --- a/apps/map/migrations/0063_auto_20180525_0052.py +++ b/apps/map/migrations/0063_auto_20180525_0052.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-05-25 00:52 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0064_auto_20180526_1536.py b/apps/map/migrations/0064_auto_20180526_1536.py index f5eb68f..9e7a8b4 100644 --- a/apps/map/migrations/0064_auto_20180526_1536.py +++ b/apps/map/migrations/0064_auto_20180526_1536.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-05-26 15:36 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0065_casestudy_images.py b/apps/map/migrations/0065_casestudy_images.py index 7ccbae0..c47078d 100644 --- a/apps/map/migrations/0065_casestudy_images.py +++ b/apps/map/migrations/0065_casestudy_images.py @@ -2,7 +2,8 @@ # Generated by Django 1.11.6 on 2018-05-26 15:47 from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0068_casestudydraft_created.py b/apps/map/migrations/0068_casestudydraft_created.py index 2a9e54f..c2a0957 100644 --- a/apps/map/migrations/0068_casestudydraft_created.py +++ b/apps/map/migrations/0068_casestudydraft_created.py @@ -2,8 +2,9 @@ # Generated by Django 1.11.6 on 2018-05-30 02:52 from __future__ import unicode_literals -from django.db import migrations, models import django.utils.timezone +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0069_remove_null_from_text_fields.py b/apps/map/migrations/0069_remove_null_from_text_fields.py index 47ea0b4..c14b384 100644 --- a/apps/map/migrations/0069_remove_null_from_text_fields.py +++ b/apps/map/migrations/0069_remove_null_from_text_fields.py @@ -2,8 +2,9 @@ # Generated by Django 1.11.15 on 2018-09-22 17:43 from __future__ import unicode_literals -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models string_fields = [ "additional_technical_details", diff --git a/apps/map/migrations/0070_remove_null_from_text_fields_schema.py b/apps/map/migrations/0070_remove_null_from_text_fields_schema.py index d5e3e7c..ab83ba6 100644 --- a/apps/map/migrations/0070_remove_null_from_text_fields_schema.py +++ b/apps/map/migrations/0070_remove_null_from_text_fields_schema.py @@ -2,8 +2,9 @@ # Generated by Django 1.11.15 on 2018-09-22 18:06 from __future__ import unicode_literals -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0071_point_of_interest.py b/apps/map/migrations/0071_point_of_interest.py index 4726494..01bcd4f 100644 --- a/apps/map/migrations/0071_point_of_interest.py +++ b/apps/map/migrations/0071_point_of_interest.py @@ -2,11 +2,12 @@ # Generated by Django 1.11.6 on 2018-10-12 22:48 from __future__ import unicode_literals -from django.conf import settings import django.contrib.gis.db.models.fields -from django.db import migrations, models import django.db.models.deletion import django_extensions.db.fields +from django.conf import settings +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0072_auto_20181201_2315.py b/apps/map/migrations/0072_auto_20181201_2315.py index 3e1cc44..c6d0cc7 100644 --- a/apps/map/migrations/0072_auto_20181201_2315.py +++ b/apps/map/migrations/0072_auto_20181201_2315.py @@ -1,9 +1,9 @@ # Generated by Django 2.1.1 on 2018-12-01 23:15 - -from django.db import migrations, models import django.db.models.deletion import django_extensions.db.fields import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0073_auto_20181202_0209.py b/apps/map/migrations/0073_auto_20181202_0209.py index 1d50de5..96b7cdb 100644 --- a/apps/map/migrations/0073_auto_20181202_0209.py +++ b/apps/map/migrations/0073_auto_20181202_0209.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.1 on 2018-12-02 02:09 - -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0074_auto_20181202_0223.py b/apps/map/migrations/0074_auto_20181202_0223.py index 0303d35..47d28a0 100644 --- a/apps/map/migrations/0074_auto_20181202_0223.py +++ b/apps/map/migrations/0074_auto_20181202_0223.py @@ -1,5 +1,4 @@ # Generated by Django 2.1.1 on 2018-12-02 02:23 - from django.db import migrations diff --git a/apps/map/migrations/0075_auto_20190304_2016.py b/apps/map/migrations/0075_auto_20190304_2016.py index 610b72e..eb3952e 100644 --- a/apps/map/migrations/0075_auto_20190304_2016.py +++ b/apps/map/migrations/0075_auto_20190304_2016.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.1 on 2019-03-04 20:16 - -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0076_casestudy_form_type.py b/apps/map/migrations/0076_casestudy_form_type.py index 85308d6..fa84b72 100644 --- a/apps/map/migrations/0076_casestudy_form_type.py +++ b/apps/map/migrations/0076_casestudy_form_type.py @@ -1,6 +1,6 @@ # Generated by Django 2.1.1 on 2019-03-04 20:40 - -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0077_auto_20190321_1924.py b/apps/map/migrations/0077_auto_20190321_1924.py index dd545b1..4e449e9 100644 --- a/apps/map/migrations/0077_auto_20190321_1924.py +++ b/apps/map/migrations/0077_auto_20190321_1924.py @@ -1,7 +1,7 @@ # Generated by Django 2.1.1 on 2019-03-21 19:24 - -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0078_latest_form_changes.py b/apps/map/migrations/0078_latest_form_changes.py index 587a6c7..61232c7 100644 --- a/apps/map/migrations/0078_latest_form_changes.py +++ b/apps/map/migrations/0078_latest_form_changes.py @@ -1,8 +1,8 @@ # Generated by Django 2.1.1 on 2019-04-07 15:30 - -from django.db import migrations, models import django_countries.fields import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/migrations/0079_auto_20190407_1604.py b/apps/map/migrations/0079_auto_20190407_1604.py index 96c36fd..db44304 100644 --- a/apps/map/migrations/0079_auto_20190407_1604.py +++ b/apps/map/migrations/0079_auto_20190407_1604.py @@ -1,7 +1,7 @@ # Generated by Django 2.1.1 on 2019-04-07 16:04 - -from django.db import migrations, models import multiselectfield.db.fields +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/apps/map/models.py b/apps/map/models.py index 70e45e6..6b499c4 100644 --- a/apps/map/models.py +++ b/apps/map/models.py @@ -6,9 +6,8 @@ from django.contrib.gis.db import models from django.db import connection from django.template.defaultfilters import slugify from django.utils.translation import ugettext_lazy as _ - -from django_extensions.db.fields import AutoSlugField from django_countries.fields import CountryField +from django_extensions.db.fields import AutoSlugField from multiselectfield import MultiSelectField from phonenumber_field.modelfields import PhoneNumberField diff --git a/apps/map/tests.py b/apps/map/tests.py index ae7f0e8..b2f0658 100644 --- a/apps/map/tests.py +++ b/apps/map/tests.py @@ -7,9 +7,9 @@ from django.test import TestCase from django.urls import reverse from django.utils.translation import activate -from .views import DraftsAPI from .models import CaseStudy from .models import CaseStudyDraft +from .views import DraftsAPI class CaseStudyDraftAPITests(TestCase): diff --git a/apps/map/views.py b/apps/map/views.py index 3bb4054..70b2a8a 100644 --- a/apps/map/views.py +++ b/apps/map/views.py @@ -1,28 +1,31 @@ -import logging import json +import logging -from django.shortcuts import get_object_or_404 +from dal import autocomplete from django.conf import settings -from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin +from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.mixins import UserPassesTestMixin from django.core.mail import send_mail from django.db.models import Q from django.http import HttpResponse +from django.shortcuts import get_object_or_404 from django.urls import reverse from django.urls import reverse_lazy from django.utils.translation import get_language from django.views import View from django.views.generic import DetailView from django.views.generic.base import TemplateView -from django.views.generic.edit import CreateView, UpdateView +from django.views.generic.edit import CreateView +from django.views.generic.edit import UpdateView -from dal import autocomplete - -from apps.files.models import File - -from . import models from . import forms -from .models import CaseStudy, CaseStudyDraft, SpatialRefSys -from .forms import ShortCaseStudyForm, LongCaseStudyForm +from . import models +from .forms import LongCaseStudyForm +from .forms import ShortCaseStudyForm +from .models import CaseStudy +from .models import CaseStudyDraft +from .models import SpatialRefSys +from apps.files.models import File logger = logging.getLogger(__name__) @@ -219,7 +222,9 @@ class DraftsAPI(LoginRequiredMixin, View): except models.CaseStudyDraft.DoesNotExist: # If it doesn't exist, create it - CaseStudyDraft.objects.create(author=request.user, data=request.body.decode()) + CaseStudyDraft.objects.create( + author=request.user, data=request.body.decode() + ) return HttpResponse(status=201) # Created def delete(self, request): diff --git a/apps/map/widgets.py b/apps/map/widgets.py index 2db4d46..f3460ae 100644 --- a/apps/map/widgets.py +++ b/apps/map/widgets.py @@ -1,6 +1,7 @@ import json from django.forms import widgets + from apps.files.models import File diff --git a/apps/profiles/admin.py b/apps/profiles/admin.py index 4185d36..5d28852 100644 --- a/apps/profiles/admin.py +++ b/apps/profiles/admin.py @@ -1,3 +1,2 @@ # from django.contrib import admin - # Register your models here. diff --git a/apps/profiles/forms.py b/apps/profiles/forms.py index 93d250a..24ed7c3 100644 --- a/apps/profiles/forms.py +++ b/apps/profiles/forms.py @@ -1,5 +1,5 @@ -from django.forms import ModelForm from django.contrib.auth import get_user_model +from django.forms import ModelForm class UpdateProfile(ModelForm): diff --git a/apps/profiles/models.py b/apps/profiles/models.py index 0b4331b..474ee08 100644 --- a/apps/profiles/models.py +++ b/apps/profiles/models.py @@ -1,3 +1,2 @@ # from django.db import models - # Create your models here. diff --git a/apps/profiles/tests.py b/apps/profiles/tests.py index a79ca8b..601fc86 100644 --- a/apps/profiles/tests.py +++ b/apps/profiles/tests.py @@ -1,3 +1,2 @@ # from django.test import TestCase - # Create your tests here. diff --git a/ojusomap/settings.py b/ojusomap/settings.py index c7a89d9..5aa7236 100644 --- a/ojusomap/settings.py +++ b/ojusomap/settings.py @@ -9,11 +9,11 @@ https://docs.djangoproject.com/en/1.11/topics/settings/ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.11/ref/settings/ """ - import os + import raven -from django.utils.translation import ugettext_lazy as _ from django.contrib.messages import constants as messages +from django.utils.translation import ugettext_lazy as _ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/ojusomap/tests.py b/ojusomap/tests.py index bff653e..f35ced5 100644 --- a/ojusomap/tests.py +++ b/ojusomap/tests.py @@ -1,17 +1,14 @@ -from contextlib import contextmanager import time +from contextlib import contextmanager from django.contrib.auth.models import User from django.test import LiveServerTestCase - from selenium import webdriver from selenium.webdriver.common.by import By -from selenium.webdriver.support.expected_conditions import ( - staleness_of, - visibility_of_element_located, -) -from selenium.webdriver.support.wait import WebDriverWait +from selenium.webdriver.support.expected_conditions import staleness_of +from selenium.webdriver.support.expected_conditions import visibility_of_element_located from selenium.webdriver.support.select import Select +from selenium.webdriver.support.wait import WebDriverWait from apps.map.models import CaseStudy diff --git a/ojusomap/urls.py b/ojusomap/urls.py index 76fdb2a..701ccdb 100644 --- a/ojusomap/urls.py +++ b/ojusomap/urls.py @@ -1,4 +1,5 @@ -from django.conf.urls import include, url +from django.conf.urls import include +from django.conf.urls import url from django.conf.urls.i18n import i18n_patterns from django.contrib import admin diff --git a/ojusomap/views.py b/ojusomap/views.py index 7a80bf5..942a75b 100644 --- a/ojusomap/views.py +++ b/ojusomap/views.py @@ -1,6 +1,6 @@ from django.utils import translation -from django.views.i18n import set_language from django.views.generic import View +from django.views.i18n import set_language class LanguageDropdownView(View): diff --git a/ojusomap/wsgi.py b/ojusomap/wsgi.py index 5fd7a35..93f0867 100644 --- a/ojusomap/wsgi.py +++ b/ojusomap/wsgi.py @@ -6,10 +6,10 @@ It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ """ - import os -from raven.contrib.django.raven_compat.middleware.wsgi import Sentry + from django.core.wsgi import get_wsgi_application +from raven.contrib.django.raven_compat.middleware.wsgi import Sentry os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ojusomap.settings")