summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-02-15 14:00:11 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-02-15 14:00:11 +0100
commitadc983460f6b0e505ff4ecf768a30f075a3dd028 (patch)
tree080bf8df24ac1e3cba7defc7dea130ae6a75a11f
parentd5b62b9f44d78dcee6b7c8a4c7f88fbb930e42f2 (diff)
downloadChimère-adc983460f6b0e505ff4ecf768a30f075a3dd028.tar.bz2
Chimère-adc983460f6b0e505ff4ecf768a30f075a3dd028.zip
Fix bad merge
-rw-r--r--chimere/forms.py2
-rw-r--r--chimere/views.py3
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: