Merge pull request #283 from the-deep/fix-report-export

Add additional check for tabular field in Data Series Entry

apps/export/entries/report_exporter.py

@@ -66,9 +66,9 @@ def _generate_for_entry(self, entry):
         if entry.entry_type == Entry.IMAGE:
             image = entry.image
             # para.add_run().add_image(entry.image)
-        elif entry.entry_type == Entry.DATA_SERIES:
+        elif entry.entry_type == Entry.DATA_SERIES and entry.tabular_field:
             image = viz_renderer.get_entry_image(entry)
-            health_stats = entry.tabular_field.cache.get('health_stats', {})
+            health_stats = (entry.tabular_field.cache or {}).get('health_stats', {})
             image_text = ' Total values: {}, Invalid value: {}, Null value: {}'.format(
                 health_stats.get('total', 'N/A'),
                 health_stats.get('invalid', 'N/A'),

apps/gallery/views.py

@@ -47,6 +47,12 @@ def DEFAULT_EXTRACTION_FUNCTION(file):
     return {}
 
 
+class FileView(View):
+    def get(self, request, file_id):
+        file = get_object_or_404(File, id=file_id)
+        return redirect(request.build_absolute_uri(file.file.url))
+
+
 class PublicFileView(View):
     def get(self, request, fidb64=None, token=None, filename=None):
         file_id = force_text(urlsafe_base64_decode(fidb64))

deep/urls.py

@@ -19,6 +19,7 @@
     unsubscribe_email,
 )
 from gallery.views import (
+    FileView,
     FileViewSet,
     GoogleDriveFileViewSet,
     DropboxFileViewSet,
@@ -289,6 +290,7 @@ def get_api_path(path):
         TokenRefreshView.as_view()),
 
     # Gallery
+    url(r'^file/(?P<file_id>\d+)/$', FileView.as_view(), name='file'),
     url(
         r'^public-file/(?P<fidb64>[0-9A-Za-z]+)/(?P<token>.+)/(?P<filename>.*)$',
         PublicFileView.as_view(),