Include internal category in filter and limit exported fields (#1301)

Author: jimmyfagan

apps/dot_ext/admin.py

@@ -91,10 +91,6 @@ def clean_agree(self):
 class MyApplicationAdmin(admin.ModelAdmin, ExportCsvMixin):
     form = CustomAdminApplicationForm
 
-    def get_fieldsets(self, request, obj=None):
-        fieldsets = super().get_fieldsets(request, obj)
-        return fieldsets
-
     def get_list_display(self, request):
         return (
             "name",
@@ -115,6 +111,7 @@ def get_list_display(self, request):
         "require_demographic_scopes",
         "active",
         "skip_authorization",
+        "internal_application_labels",
     )
 
     radio_fields = {
@@ -133,6 +130,29 @@ def get_search_fields(self, request):
             "=authorization_grant_type",
         )
 
+    def get_export_fields(self, request):
+        return (
+            "id",
+            "user",
+            "name",
+            "created",
+            "website_uri",
+            "redirect_uris",
+            "logo_uri",
+            "tos_uri",
+            "policy_uri",
+            "contacts",
+            "support_email",
+            "support_phone_number",
+            "description",
+            "active",
+            "first_active",
+            "last_active",
+            "require_demographic_scopes",
+            "data_access_type",
+            "internal_application_labels",
+        )
+
     raw_id_fields = ("user",)
 
     actions = ["export_as_csv"]

apps/dot_ext/csv.py

@@ -11,16 +11,20 @@ class ExportCsvMixin:
     """
     def export_as_csv(self, request, queryset):
 
-        meta = self.model._meta
-        field_names = [field.name for field in meta.fields]
+        def get_value(obj, key):
+            if key == "internal_application_labels":
+                return getattr(obj, key).all()
+            return getattr(obj, key)
+
+        export_fields = self.get_export_fields(None)
 
         response = HttpResponse(content_type='text/csv')
-        response['Content-Disposition'] = 'attachment; filename={}.csv'.format(meta)
+        response['Content-Disposition'] = 'attachment; filename={}.csv'.format(self.model._meta)
         writer = csv.writer(response)
 
-        writer.writerow(field_names)
+        writer.writerow(export_fields)
         for obj in queryset:
-            writer.writerow([getattr(obj, field) for field in field_names])
+            writer.writerow([get_value(obj, field) for field in export_fields])
 
         return response
 

apps/dot_ext/fixtures/internal_application_labels.json

@@ -48,8 +48,8 @@
         "model": "dot_ext.internalapplicationlabels",
         "pk": 7,
         "fields": {
-            "label": "Medication managementz",
-            "slug": "medication-managementz",
+            "label": "Medication management",
+            "slug": "medication-management",
             "description": "Desc: place holder"
         }
     },