diff options
Diffstat (limited to 'chimere/admin.py')
| -rw-r--r-- | chimere/admin.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index b4ac5ce..d5af268 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2008-2015 É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 General Public License as @@ -45,7 +45,7 @@ from chimere.models import Category, Icon, SubCategory, Marker, \ PropertyModel, News, Route, Map, ColorTheme, Color, \ MultimediaFile, PictureFile, Importer, Layer, MapLayers,\ PropertyModelChoice, MultimediaExtension, Page, MapUsers, MapGroups,\ - get_maps_for_user, get_users_by_map + get_maps_for_user, get_users_by_map, ImporterKeyCategories from chimere.utils import unicode_normalize, ShapefileManager, KMLManager,\ CSVManager @@ -263,6 +263,7 @@ class MarkerAdmin(admin.ModelAdmin): ''' return managed_modified(self, request, Marker.objects.filter(pk=item_id)) + def get_urls(self): from django.conf.urls.defaults import patterns, url urls = super(MarkerAdmin, self).get_urls() @@ -409,13 +410,18 @@ def export_to_osm(modeladmin, request, queryset): context_instance=RequestContext(request)) export_to_osm.short_description = _(u"Export to osm") +class ImporterKeyInline(admin.TabularInline): + model = ImporterKeyCategories + extra = 1 + class ImporterAdmin(admin.ModelAdmin): form = ImporterAdminForm - list_display = ('display_categories', 'default_name', 'importer_type', + list_display = ('importer_type', 'display_categories', 'default_name', 'source', 'state', 'filtr') list_filter = ('importer_type', 'categories') readonly_fields = ('state',) actions = [importing, cancel_import, export_to_osm, cancel_export] + inlines = [ImporterKeyInline] class PageAdmin(admin.ModelAdmin): """ |