diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-03 15:53:26 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-03 15:53:26 +0100 |
| commit | 2629efa611018da0fac8304391488381142ced24 (patch) | |
| tree | a79fdbae63264fe526ef540ef4fb5bf28317ddf1 /ishtar_common/admin.py | |
| parent | 50e64a901062c140b3f38a137823c46e940c180f (diff) | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| download | Ishtar-2629efa611018da0fac8304391488381142ced24.tar.bz2 Ishtar-2629efa611018da0fac8304391488381142ced24.zip | |
Merge branch 'v0.9' into wheezy
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) |