diff options
| -rw-r--r-- | ishtar_common/admin.py | 6 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index a3eb39104..7c5d505b3 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -389,7 +389,7 @@ class AdminRelatedTownForm(forms.ModelForm): class AdminTownForm(forms.ModelForm): class Meta: model = models.Town - exclude = ['imports'] + exclude = ['imports', 'departement'] center = PointField(label=_(u"Center"), required=False, widget=OSMWidget) limit = MultiPolygonField(label=_(u"Limit"), required=False, @@ -414,8 +414,8 @@ class TownAdmin(ImportActionAdmin): readonly_fields = ['cached_label'] if settings.COUNTRY == 'fr': list_display += ['numero_insee'] - search_fields += ['numero_insee', 'departement__label', ] - list_filter = ("departement",) + search_fields += ['numero_insee', 'areas__label'] + list_filter = ("areas",) form = AdminTownForm inlines = [TownParentInline] actions = [export_as_csv_action(exclude=['center', 'limit'])] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index e862885d0..f6eeab72f 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -3855,7 +3855,7 @@ class Area(HierarchicalType): class Meta: verbose_name = _(u"Area") verbose_name_plural = _(u"Areas") - ordering = ('parent__label', 'label') + ordering = ('label',) def __unicode__(self): if not self.reference: |