Skip to content

Commit

Permalink
adaption CSVRender views
Browse files Browse the repository at this point in the history
  • Loading branch information
sliob committed Mar 31, 2017
1 parent 1164627 commit 63c4eb2
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions geokey_export/views.py
Expand Up @@ -30,6 +30,7 @@
from geokey.contributions.views.observations import GZipView, GeoJsonView
from geokey.contributions.renderers.geojson import GeoJsonRenderer
from geokey.contributions.renderers.kml import KmlRenderer
from renders import CSVRenderer

from .models import Export

Expand Down Expand Up @@ -282,8 +283,15 @@ def get_context(self, request, urlhash):
return context

def get(self, request, urlhash, format=None):
context = self.get_context(request, urlhash)
export = context.get('export')
if '-comments' in urlhash:
urlhash = urlhash[:-9]
context = self.get_context(request, urlhash)
export = context.get('export')
comments = True
else:
context = self.get_context(request, urlhash)
export = context.get('export')
comments = False

if export and format:
content_type = 'text/plain'
Expand All @@ -292,6 +300,8 @@ def get(self, request, urlhash, format=None):
renderer = GeoJsonRenderer()
elif format == 'kml':
renderer = KmlRenderer()
elif format == 'csv':
renderer = CSVRenderer()

contributions = export.project.get_all_contributions(
export.creator).filter(category=export.category)
Expand Down Expand Up @@ -335,7 +345,10 @@ def get(self, request, urlhash, format=None):
context={'user': export.creator, 'project': export.project}
).data

content = renderer.render(serializer.data)
if comments:
content = renderer.render_comments(serializer.data)
else:
content = renderer.render(serializer.data)

if export.isoneoff:
export.expire()
Expand Down

0 comments on commit 63c4eb2

Please sign in to comment.