diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-19 00:46:04 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-19 00:46:04 +0200 | 
| commit | 8c41629a8abed0d81970b9c23f403b3d4d3e54b2 (patch) | |
| tree | 0858a17cb6f2b8b3acf2738614dcd84af0a59387 /chimere/admin.py | |
| parent | 2bfbf7b6a1dcfd3419ed9bba8d235ba27f84cac8 (diff) | |
| parent | 3b6930b25c0d77e1e15c5a79becc5a523e661013 (diff) | |
| download | Chimère-8c41629a8abed0d81970b9c23f403b3d4d3e54b2.tar.bz2 Chimère-8c41629a8abed0d81970b9c23f403b3d4d3e54b2.zip  | |
Merge branch 'master' into saclay
Diffstat (limited to 'chimere/admin.py')
| -rw-r--r-- | chimere/admin.py | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index 3b3af2c..53362ec 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -207,8 +207,8 @@ export_to_osm.short_description = _(u"Export to osm")  class ImporterAdmin(admin.ModelAdmin):      form = ImporterAdminForm -    list_display = ('display_categories', 'importer_type', 'source', 'state', -                    'filtr') +    list_display = ('display_categories', 'default_name', 'importer_type', +                    'source', 'state', 'filtr')      list_filter = ('importer_type',)      readonly_fields = ('state',)      actions = [importing, cancel_import, export_to_osm, cancel_export]  | 
