Merge branch 'develop' into develop-bootstrap

1 files changed, 6 insertions, 4 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 2df910ffd..45e4f7038 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -30,7 +30,7 @@ from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.admin import SiteAdmin
 from django.contrib.sites.models import Site
-from django.contrib.gis.forms import PointField, OSMWidget
+from django.contrib.gis.forms import PointField, OSMWidget, MultiPolygonField
 from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import render
 from django.template.defaultfilters import slugify
@@ -194,8 +194,10 @@ class AdminTownForm(forms.ModelForm):
     class Meta:
         model = models.Town
         exclude = ['imports']
-    center = PointField(label=_(u"center"), required=False,
+    center = PointField(label=_(u"Center"), required=False,
                         widget=OSMWidget)
+    limit = MultiPolygonField(label=_(u"Limit"), required=False,
+                              widget=OSMWidget)
     children = AutoCompleteSelectMultipleField('town', required=False,
                                                label=_(u"Town children"))
 
@@ -211,11 +213,11 @@ class TownParentInline(admin.TabularInline):
 
 class TownAdmin(admin.ModelAdmin):
     model = models.Town
-    list_display = ['name', ]
+    list_display = ['name', 'year']
     search_fields = ['name']
     readonly_fields = ['cached_label']
     if settings.COUNTRY == 'fr':
-        list_display += ['numero_insee', 'departement', ]
+        list_display += ['numero_insee']
         search_fields += ['numero_insee', 'departement__label', ]
         list_filter = ("departement",)
     form = AdminTownForm