diff options
| -rw-r--r-- | chimere/forms.py | 4 | ||||
| -rw-r--r-- | chimere/tests.py | 12 | ||||
| -rw-r--r-- | chimere/views.py | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 5fa7ea9..91ba686 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -383,11 +383,11 @@ class MarkerAdminFormBase(forms.ModelForm): self.fields.pop(k) def clean(self): - ''' + """ Verify that a start date is provided when an end date is set Verify the mandatory properties (to be check manualy because it depends on the checked categories) - ''' + """ start_date = self.cleaned_data.get('start_date') end_date = self.cleaned_data.get('end_date') if end_date and not start_date: diff --git a/chimere/tests.py b/chimere/tests.py index 9a3e080..6793234 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -40,12 +40,13 @@ def areas_setup(): area_1 = Area.objects.create( name='area 1', urn='area-1', order=1, available=True, upper_left_corner='SRID=4326;POINT(-4.907753 48.507656)', - lower_right_corner='SRID=4326;POINT(-4.049447 48.279688)') + lower_right_corner='SRID=4326;POINT(-4.049447 48.279688)', + default=True + ) area_2 = Area.objects.create( name='area 2', urn='area-2', order=2, available=True, upper_left_corner='SRID=4326;POINT(-3 47.5)', lower_right_corner='SRID=4326;POINT(-2.5 47)', - default=True ) area_3 = Area.objects.create( name='area 3', urn='area-3', order=3, available=True, @@ -574,7 +575,11 @@ class AreaTest(TestCase): def test_area_availability(self): area_1 = self.areas[0] area_1.available = False + area_1.default = False area_1.save() + area_2 = self.areas[1] + area_2.default = True + area_2.save() response = self.client.get('/%s/' % area_1.urn) self.assertNotIn( str(area_1.upper_left_corner.y), str(response.content), @@ -643,7 +648,8 @@ class DynamicCategoryTest(TestCase): response = self.client.get(url) self.assertEqual(200, response.status_code) cats = json.loads(str(response.content, 'utf-8'))['categories'] - self.assertEqual(len(cats), 5) + # the default area is get: only one category in this area + self.assertEqual(len(cats), 1) class NewsTest(TestCase): diff --git a/chimere/views.py b/chimere/views.py index 21769a9..3070132 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -844,9 +844,9 @@ def getMarker(request, area_name, pk): def get_all_categories(request, area_name=None): - ''' + """ Get all available categories in JSON - ''' + """ context_data, redir = get_base_response(request, area_name) area = context_data["area"] subcategories = [] |