Merge remote-tracking branch 'origin/master'

apps/map/migrations/0064_auto_20180526_1536.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-05-26 15:36
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('map', '0063_auto_20180525_0052'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='casestudy',
+            name='land_ownership_details',
+            field=models.CharField(blank=True, help_text='Please specify details about land ownership', max_length=256, null=True, verbose_name='Land ownership/tenure details'),
+        ),
+    ]

apps/map/models.py

@@ -310,7 +310,7 @@ class CaseStudy(models.Model):
     # 1.5.3
     land_ownership_details = models.CharField(
         verbose_name=_("Land ownership details"),
-        help_text=_("Please specify details about land ownership if you chose 'other'"),
+        help_text=_("Please specify details about land ownership"),
         max_length=256,
         null=True,
         blank=True,

apps/map/templates/map/form.html

@@ -177,11 +177,7 @@
   <script>
     // Here we define the fields we need to conditionally toggle.
     // TODO: Move this knowledge out of the template
-    var conditionalFields = [{
-      "field": "#id_land_ownership",
-      "showHide": ["#div_id_land_ownership_details"],
-      "condition": ["OTH"]
-    },
+    var conditionalFields = [
     {
       "field": "#id_location_context",
       "showHide": ["#div_id_type_of_ecosystem"],