diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-04-16 16:52:00 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-04-16 16:52:00 +0000 |
| commit | d715b71f39fae579b79f9ce4fd3f9fb2a828311b (patch) | |
| tree | e851a91f6f514abcfd20b7d5e8ebabe30e2e2b2e /ishtar_common | |
| parent | 5a8f66d8349b00812a4a8b55317688a7832a10a3 (diff) | |
| parent | 83cb933dcd05bd6308b68fa1559d828f5b1a18bc (diff) | |
| download | Ishtar-d715b71f39fae579b79f9ce4fd3f9fb2a828311b.tar.bz2 Ishtar-d715b71f39fae579b79f9ce4fd3f9fb2a828311b.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/admin.py | 10 | ||||
| -rw-r--r-- | ishtar_common/locale/fr/LC_MESSAGES/django.po | 2 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 8f6a07f88..b470f8223 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -81,8 +81,14 @@ class PersonTypeAdmin(admin.ModelAdmin): admin.site.register(models.PersonType, PersonTypeAdmin) -basic_models = [models.IshtarUser, models.SourceType, models.AuthorType, - models.OrganizationType] +class GeneralTypeAdmin(admin.ModelAdmin): + list_display = ('label', 'txt_idx', 'available') + +general_models = [models.OrganizationType, models.SourceType, models.AuthorType] +for model in general_models: + admin.site.register(model, GeneralTypeAdmin) + +basic_models = [models.IshtarUser] if settings.COUNTRY == 'fr': basic_models += [models.Arrondissement, models.Canton] diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po index 636601db5..96a467273 100644 --- a/ishtar_common/locale/fr/LC_MESSAGES/django.po +++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po @@ -897,7 +897,7 @@ msgstr "Dossier en relation avec :" #: templates/sheet_file.html:46 templates/sheet_ope.html:49 #: templates/sheet_ope_modif.html:49 templates/sheet_operation.html:49 msgid "Main address:" -msgstr "Adresse principale :" +msgstr "Adresse des terrains :" #: templates/sheet_file.html:47 templates/sheet_ope.html:50 #: templates/sheet_ope_modif.html:50 templates/sheet_operation.html:50 diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 3e428999e..458802087 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -206,7 +206,7 @@ class GeneralType(models.Model): items = cls.objects.filter(**dct) if exclude: items = items.exclude(txt_idx__in=exclude) - for item in items.all(): + for item in items.order_by(*cls._meta.ordering).all(): if instances: item.rank = 0 yield item |