diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-18 18:40:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-18 18:40:08 +0200 |
| commit | eae43c06dd104784eb16731a2bab9e62b3751750 (patch) | |
| tree | a7d00b6f797d972bd1cd1ec72a18f321f3ca990c /chimere/admin.py | |
| parent | 40eeb69dff20548846b5ef83c9ced0ad4f32e099 (diff) | |
| parent | 0404b15a18f242ca1649b5fadfdc80cf76a94ae6 (diff) | |
| download | Chimère-eae43c06dd104784eb16731a2bab9e62b3751750.tar.bz2 Chimère-eae43c06dd104784eb16731a2bab9e62b3751750.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/forms.py
example_project/settings.py
Diffstat (limited to 'chimere/admin.py')
| -rw-r--r-- | chimere/admin.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index e86bcea..d497da5 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -41,7 +41,8 @@ from chimere.models import Category, Icon, SubCategory, Marker, \ PropertyModel, News, Route, Area, ColorTheme, Color, RouteFile,\ MultimediaType, MultimediaFile, PictureFile, Importer, Layer, AreaLayers,\ PropertyModelChoice, MultimediaExtension, Page -from chimere.utils import unicode_normalize, ShapefileManager, KMLManager +from chimere.utils import unicode_normalize, ShapefileManager, KMLManager,\ + CSVManager def get_areas_for_user(user): """ @@ -87,6 +88,16 @@ def export_to_shapefile(modeladmin, request, queryset): return response export_to_shapefile.short_description = _(u"Export to Shapefile") +def export_to_csv(modeladmin, request, queryset): + u""" + Export data to CSV + """ + filename, result = CSVManager.export(queryset) + response = HttpResponse(result, mimetype='text/csv') + response['Content-Disposition'] = 'attachment; filename=%s' % filename + return response +export_to_csv.short_description = _(u"Export to CSV") + class PictureInline(admin.TabularInline): model = PictureFile extra = 1 @@ -102,7 +113,7 @@ class MarkerAdmin(admin.ModelAdmin): search_fields = ("name",) list_display = ('name', 'status') list_filter = ('status', 'categories') - actions = [validate, export_to_kml, export_to_shapefile] + actions = [validate, export_to_kml, export_to_shapefile, export_to_csv] exclude = ['submiter_session_key', 'import_key', 'import_version', 'available_date', 'ref_item'] readonly_fields = ['submiter_email', 'submiter_comment', 'import_source', @@ -199,7 +210,7 @@ class ImporterAdmin(admin.ModelAdmin): list_display = ('importer_type', 'source', 'state', 'filtr') list_filter = ('importer_type',) readonly_fields = ('state',) - actions = [importing, cancel_import, cancel_export] + actions = [importing, cancel_import, export_to_osm, cancel_export] admin.site.register(Importer, ImporterAdmin) class PageAdmin(admin.ModelAdmin): |