Merge branch 'master' into 88-enable-creation-of-datasets-from-the-my-files-table

portal/views/secure/datafile.py

@@ -104,7 +104,7 @@ class DataFilesJSONListView(LoginRequiredMixin, JSONListView):
                 'hash': '<span class="text-monospace">{}</span>'.format(o.hash[:8]),
                 'size': filters.filesizeformat(o.file.size),
                 'upload_date': timezone.localtime(o.upload_timestamp).strftime('%Y-%m-%d %H:%M:%S %Z'),
-                'lab': str(o.lab),
+                'lab': str(o.lab) if o.lab else '',
                 'datasets': datasets,
                 'action_buttons': render_to_string(
                     'portal/templates/portal/widgets/action_buttons.html',
@@ -157,7 +157,7 @@ class SharedWithMeDataFilesJSONListView(DataFilesJSONListView):
                 'upload_date': timezone.localtime(o.upload_timestamp).strftime('%Y-%m-%d %H:%M:%S %Z'),
                 'datasets': datasets,
                 'uploaded_by': o.uploaded_by.fullname,
-                'lab': str(o.lab),
+                'lab': str(o.lab) if o.lab else '',
                 'action_buttons': render_to_string(
                     'portal/templates/portal/widgets/action_buttons.html',
                     {'buttons': [