summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-10-22 20:29:45 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-10-22 20:35:10 +0200
commit5b5c1bd7dd865fb530b156212474846db59b2191 (patch)
tree9231343e50584d48cba27816dbef309f0a7209f9 /ishtar_common
parentee94a8b12e3187bd20646f4eac698d2fb7a9a9f9 (diff)
downloadIshtar-5b5c1bd7dd865fb530b156212474846db59b2191.tar.bz2
Ishtar-5b5c1bd7dd865fb530b156212474846db59b2191.zip
Admin: improve target admin
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/admin.py7
-rw-r--r--ishtar_common/models.py8
2 files changed, 12 insertions, 3 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 9f8d2d809..c1dbb2238 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -198,9 +198,10 @@ admin.site.register(models.Import, ImportAdmin)
class TargetKeyAdmin(admin.ModelAdmin):
- list_display = ('target', 'key', 'value', 'is_set')
- list_filter = ("is_set",)
- search_fields = ('target', 'key')
+ list_display = ('target', 'importer_type', 'column_nb', 'key',
+ 'value', 'is_set')
+ list_filter = ("is_set", "target__column__importer_type")
+ search_fields = ('target__target', 'value', 'key')
admin.site.register(models.TargetKey, TargetKeyAdmin)
basic_models = [models.IshtarUser, models.DocumentTemplate]
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 3b2fca3dd..63ea7d2a8 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1416,6 +1416,14 @@ class TargetKey(models.Model):
def __unicode__(self):
return u" - ".join([unicode(self.target), self.key[:50]])
+ def column_nb(self):
+ # for the admin
+ return self.target.column.col_number
+
+ def importer_type(self):
+ # for the admin
+ return self.target.column.importer_type.name
+
def format(self):
if not self.is_set:
return None