diff --git a/apps/map/admin.py b/apps/map/admin.py
index 04be4b3..2b2b5e1 100644
--- a/apps/map/admin.py
+++ b/apps/map/admin.py
@@ -1,21 +1,7 @@
from django.contrib import admin
-from django import forms
-
-from dal import autocomplete
from leaflet.admin import LeafletGeoAdmin
-from .models import CaseStudy, SpatialRefSys
-
-
-class CaseStudyAdminForm(forms.ModelForm):
- class Meta:
- model = CaseStudy
- widgets = {
- 'coordinate_reference_system': autocomplete.ModelSelect2(
- url='srs-autocomplete'
- )
- }
- fields = '__all__'
+from .models import CaseStudy
class CaseStudyAdmin(LeafletGeoAdmin):
@@ -44,8 +30,4 @@ class CaseStudyAdmin(LeafletGeoAdmin):
))
unapprove.short_description = "Un-approve selected case studies"
- form = CaseStudyAdminForm
-
-
admin.site.register(CaseStudy, CaseStudyAdmin)
-admin.site.register(SpatialRefSys)
diff --git a/apps/map/forms.py b/apps/map/forms.py
index 3a2ee20..25e847f 100644
--- a/apps/map/forms.py
+++ b/apps/map/forms.py
@@ -2,11 +2,9 @@ from django.urls import reverse
from django import forms
from django.utils.translation import ugettext as _
from django.utils.safestring import mark_safe
-
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 .models import CaseStudy
@@ -70,7 +68,6 @@ class ShortCaseStudyForm(BaseCaseStudyForm):
'community_voices'
]
-
class LongCaseStudyForm(BaseCaseStudyForm):
"""Long version of the CaseStudy form."""
@@ -120,9 +117,6 @@ class LongCaseStudyForm(BaseCaseStudyForm):
choices=POSITIVE_CASE_TYPE_CHOICES
)
- self.fields['project_owners'].required = True
- self.fields['shareholders'].required = True
-
self.helper.form_action = reverse('long-form')
self.helper.layout = Layout(
TabHolder(
@@ -275,8 +269,3 @@ class LongCaseStudyForm(BaseCaseStudyForm):
class Meta(BaseCaseStudyForm.Meta):
exclude = ('approved',)
- widgets = {
- 'coordinate_reference_system': autocomplete.ModelSelect2(
- url='srs-autocomplete'
- )
- }
diff --git a/apps/map/migrations/0051_auto_20180404_0024.py b/apps/map/migrations/0051_auto_20180404_0024.py
deleted file mode 100644
index 7f3ffe7..0000000
--- a/apps/map/migrations/0051_auto_20180404_0024.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-04-04 00:24
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('map', '0050_auto_20180402_1237'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='casestudy',
- name='coordinate_reference_system',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='gis.PostGISSpatialRefSys'),
- ),
- ]
diff --git a/apps/map/models.py b/apps/map/models.py
index 0429732..c9a7035 100644
--- a/apps/map/models.py
+++ b/apps/map/models.py
@@ -1,32 +1,17 @@
import datetime
from urllib import parse
-
from django.contrib.gis.db import models
from django.contrib.auth.models import User
-from django.db import connection
-from django.utils.translation import ugettext as _
-from django.template.defaultfilters import slugify
-
from django_extensions.db.fields import AutoSlugField
from django_countries.fields import CountryField
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import slugify
from multiselectfield import MultiSelectField
from phonenumber_field.modelfields import PhoneNumberField
from . import validators
-class SpatialRefSys(connection.ops.spatial_ref_sys()):
- def __str__(self):
- return self.__unicode__()
-
- def __unicode__(self):
- return '{0.auth_name}:{0.auth_srid} {0.name}'.format(self)
-
- class Meta:
- proxy = True
- verbose_name = "spatial reference system"
-
-
class Shapefile(models.Model):
file = models.FileField(
upload_to='shapefiles/',
@@ -1022,9 +1007,13 @@ class CaseStudy(models.Model):
)
# 4.3.2
- coordinate_reference_system = models.ForeignKey(
- SpatialRefSys, null=True, blank=True,
- default=4326
+ coordinate_reference_system = models.CharField(
+ verbose_name=_("Coordinate reference system"),
+ help_text=_("Enter the coordinate reference system of the shapefiles."),
+ max_length=12,
+ default=None,
+ null=True,
+ blank=True
)
# 4.3.3
diff --git a/apps/map/templates/map/form.html b/apps/map/templates/map/form.html
index 77a2232..c9b558e 100644
--- a/apps/map/templates/map/form.html
+++ b/apps/map/templates/map/form.html
@@ -1,5 +1,8 @@
{% extends "base_page.html" %}
-{% load compress crispy_forms_tags i18n leaflet_tags static %}
+{% load compress %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+{% load leaflet_tags %}
{% block stylesheets %}
@@ -17,8 +20,6 @@
{% endblock %}
{% block scripts %}
-
- {{ form.media }}
{% leaflet_js %}