diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:53:23 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:53:23 +0100 |
| commit | 9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6 (patch) | |
| tree | 2a2b687acef6f878c05f7148a150c10c3a7fb71a /ishtar_common/admin.py | |
| parent | 8eb09a666e7048ce8e531649566418670d94036d (diff) | |
| parent | c00bb6298a602f74c55cfd60b8601295470a8e3b (diff) | |
| download | Ishtar-9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6.tar.bz2 Ishtar-9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6.zip | |
Merge branch 'master' into v0.9
Conflicts:
Makefile.example
archaeological_operations/migrations/0061_regenerate_cached_label.py
archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py
Diffstat (limited to 'ishtar_common/admin.py')
| -rw-r--r-- | ishtar_common/admin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 3460c4a75..cdff25439 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -274,7 +274,7 @@ admin.site.register(models.FormaterType, FormaterTypeAdmin) class ImportAdmin(admin.ModelAdmin): - list_display = ('importer_type', 'imported_file', 'user', 'state', + list_display = ('name', 'importer_type', 'imported_file', 'user', 'state', 'creation_date') admin.site.register(models.Import, ImportAdmin) |