diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-03 15:48:08 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-03 15:48:08 +0100 |
| commit | e3541fca4619b6d6458c376067d299d11f15a2b8 (patch) | |
| tree | 41450cdd1603714842af8a3a99781a88a9bcfdf7 /ishtar_common/admin.py | |
| parent | c5a639a8c59c6aa0d9edf1895cdced3cbdebc7a2 (diff) | |
| parent | c9608717bfb09c3a52336666358c0cf816c65d76 (diff) | |
| download | Ishtar-e3541fca4619b6d6458c376067d299d11f15a2b8.tar.bz2 Ishtar-e3541fca4619b6d6458c376067d299d11f15a2b8.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/admin.py')
| -rw-r--r-- | ishtar_common/admin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index fb0ab1170..aa04a7b1c 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -202,7 +202,7 @@ class ImportTargetInline(admin.TabularInline): class ImporterColumnAdmin(admin.ModelAdmin): - list_display = ('importer_type', 'col_number', 'description', + list_display = ('label', 'importer_type', 'col_number', 'description', 'targets_lbl', 'duplicate_fields_lbl', 'required') list_filter = ('importer_type',) inlines = (ImporterDuplicateFieldInline, ImportTargetInline) |