reformat to use ListView

portal/urls.py

@@ -106,7 +106,7 @@ urlpatterns = [
     path('secure/dataset/<slug:iric_data_id>', DataSetInitDetailsView.as_view(), name='user.dataset-details-view-iric-data-id'),
     path('secure/dataset/download/<int:pk>', DataSetDownload.as_view(), name='user.dataset-download'),
     path('secure/dataset/download/<slug:iric_data_id>', DataSetDownload.as_view(), name='user.dataset-download-iric-data-id'),
-    path('secure/user/<slug:sim>/datasets', DataSetFileListJSONView.as_view(), name='admin.user-dataset-json-list'),
+    path('secure/user/<str:sim>/datasets', DataSetFileListJSONView.as_view(), name='admin.user-dataset-json-list'),
 
     # ShareGroups
     path('secure/sharegroups/list/json/', ShareGroupJSONListView.as_view(), name='secure.sharegroup-json-list'),

portal/views/secure/dataset.py

@@ -7,21 +7,21 @@ from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.db.models import Q
 from django.http import (HttpResponse, HttpResponseForbidden,
-                         HttpResponseRedirect)
+                         HttpResponseRedirect, JsonResponse)
 from django.template import defaultfilters as filters
 from django.template.loader import render_to_string
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.translation import ugettext
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import (CreateView, DeleteView, DetailView,
+from django.views.generic import (CreateView, DeleteView, DetailView, ListView,
                                   TemplateView, UpdateView)
 from portal.forms import DataSetDisplayFieldsForm, DataSetForm
 from portal.models import DataFile, DataSet, Lab, Profile, ShareGroup
 from portal.views import (ActivePageViewMixin, AjaxDatatableBackboneMixin,
                           CreateViewMixin, DeleteViewMixin, JSONListView,
-                          JSONView, LogMixin, StaffViewMixin,
-                          SuccessMessageMixin, UpdateViewMixin)
+                          LogMixin, StaffViewMixin, SuccessMessageMixin,
+                          UpdateViewMixin)
 
 logger = logging.getLogger('debug')
 
@@ -305,13 +305,13 @@ class DataSetFileListView(DataSetDetailsView):
         return HttpResponse('\n'.join(files + annotations), content_type="text/plain")
 
 
-class DataSetFileListJSONView(StaffViewMixin, JSONView):
+class DataSetFileListJSONView(StaffViewMixin, ListView):
     model = DataSet
     slug_url_kwarg = 'iric_data_id'
     slug_field = 'iric_data_id'
 
     def get_queryset(self):
-        profile = Profile.objects.filter(accountname=self.kwargs.get('slug'))
+        profile = Profile.objects.filter(accountname=self.kwargs.get('sim'))
         return super().get_queryset().filter(
             Q(created_by=profile)
             | Q(share_profiles=profile)
@@ -321,8 +321,11 @@ class DataSetFileListJSONView(StaffViewMixin, JSONView):
 
     def get_data(self):
         o = self.get_object()
-        metadata = {
+        data = {
             'name': o.name,
             'iric_data_id': o.iric_data_id
         }
-        return metadata
+        return data
+
+    def render_to_response(self, context, **response_kwargs):
+        return JsonResponse(self.get_data(), **response_kwargs)