From adc983460f6b0e505ff4ecf768a30f075a3dd028 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 15 Feb 2015 14:00:11 +0100 Subject: Fix bad merge --- chimere/forms.py | 2 +- chimere/views.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/chimere/forms.py b/chimere/forms.py index 1d7abb7..8c512ae 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -526,7 +526,7 @@ class FullFileForm(FileForm): class MapAdminForm(forms.ModelForm): """ - Admin page to create an area + Admin page to create an map """ area = AreaField(label=_("Area"), fields=(PointField(), PointField())) welcome_message = forms.CharField(widget=TextareaAdminWidget, diff --git a/chimere/views.py b/chimere/views.py index 92b21f5..0c512d4 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -208,8 +208,7 @@ def index(request, map_name=None, default_map=None, simple=False, 'zoomout':zoomout, 'has_default_map':Map.objects.filter(default=True).count(), 'zoomout':zoomout, - 'has_search':settings.CHIMERE_SEARCH_ENGINE - 'has_default_area':Area.objects.filter(default=True).count(), + 'has_search':settings.CHIMERE_SEARCH_ENGINE, 'zoomout':zoomout, }) if hasattr(settings, 'CONTACT_EMAIL') and settings.CONTACT_EMAIL: -- cgit v1.2.3