diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-02 01:11:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-02 01:11:23 +0200 |
| commit | 6f6c59d9bdbd88e4946f99f7d5d1e4f0ea9218d6 (patch) | |
| tree | 79b18b4d6180dd82e056bbc691a5cbbae154df99 | |
| parent | 9bb8f0705c848d0781e1f978de53c6ead4be7a69 (diff) | |
| parent | 5559afadcb9917cba3680585d773545b359ebc32 (diff) | |
| download | Ishtar-6f6c59d9bdbd88e4946f99f7d5d1e4f0ea9218d6.tar.bz2 Ishtar-6f6c59d9bdbd88e4946f99f7d5d1e4f0ea9218d6.zip | |
Merge branch 'stable'
| -rw-r--r-- | ishtar_common/admin.py | 4 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index c0ca88ed0..73702534c 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -130,6 +130,10 @@ class ImportAdmin(admin.ModelAdmin): 'creation_date') admin.site.register(models.Import, ImportAdmin) +class TargetKeyAdmin(admin.ModelAdmin): + list_display = ('target', 'key', 'value', 'is_set') +admin.site.register(models.TargetKey, TargetKeyAdmin) + basic_models = [models.IshtarUser, models.DocumentTemplate] if settings.COUNTRY == 'fr': basic_models += [models.Arrondissement, models.Canton] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 6a3e2ae52..fdad39c83 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1223,6 +1223,8 @@ class TargetKey(models.Model): class Meta: unique_together = ('target', 'key') + verbose_name = _(u"Importer - Target key") + verbose_name_plural = _(u"Importer - Targets keys") def __unicode__(self): return u" - ".join([unicode(self.target), self.key[:50]]) |