summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-27 19:14:27 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-27 19:14:27 +0100
commita3486a31adce8b7db3ff1b6745b3a2920f507a72 (patch)
tree4fe56362e9bd16a721478464f57762fbf5ec9c6f
parent855505d64581ffd3601fd97defb02817926e14be (diff)
downloadIshtar-a3486a31adce8b7db3ff1b6745b3a2920f507a72.tar.bz2
Ishtar-a3486a31adce8b7db3ff1b6745b3a2920f507a72.zip
Small fixes on administration
-rw-r--r--database/fr/departements-insee-2010.csv22
-rw-r--r--ishtar/furnitures/admin.py5
-rw-r--r--ishtar/furnitures/models.py1
3 files changed, 14 insertions, 14 deletions
diff --git a/database/fr/departements-insee-2010.csv b/database/fr/departements-insee-2010.csv
index ca5f026f3..29ad4b265 100644
--- a/database/fr/departements-insee-2010.csv
+++ b/database/fr/departements-insee-2010.csv
@@ -1,12 +1,12 @@
-1,Ain
-2,Aisne
-3,Allier
-4,Alpes-de-Haute-Provence
-5,Hautes-Alpes
-6,Alpes-Maritimes
-7,Ardèche
-8,Ardennes
-9,Ariège
+01,Ain
+02,Aisne
+03,Allier
+04,Alpes-de-Haute-Provence
+05,Hautes-Alpes
+06,Alpes-Maritimes
+07,Ardèche
+08,Ardennes
+09,Ariège
10,Aube
11,Aude
12,Aveyron
@@ -94,7 +94,3 @@
93,Seine-Saint-Denis
94,Val-de-Marne
95,Val-d'Oise
-971,Guadeloupe
-972,Martinique
-973,Guyane
-974,"La Réunion"
diff --git a/ishtar/furnitures/admin.py b/ishtar/furnitures/admin.py
index 7ffe387fd..1e6bf19d9 100644
--- a/ishtar/furnitures/admin.py
+++ b/ishtar/furnitures/admin.py
@@ -166,8 +166,11 @@ admin.site.register(models.Container, ContainerAdmin)
class TownAdmin(admin.ModelAdmin):
list_display = ['name',]
+ search_fields = ['name']
if settings.COUNTRY == 'fr':
- list_display += ['canton']
+ list_display += ['numero_insee', 'departement', ]
+ search_fields += ['numero_insee', 'departement', ]
+ list_filter = ("departement",)
model = models.Town
admin.site.register(models.Town, TownAdmin)
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index 1a595f629..5c19f050f 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -149,6 +149,7 @@ class Departement(models.Model):
class Meta:
verbose_name = _(u"Departement")
verbose_name_plural = _(u"Departements")
+ ordering = ['number']
def __unicode__(self):
return unicode(self.number) + u" - " + self.label