Merge branch 'development' into cms-hotfix-7.2.1

openstax · Dec 6, 2023 · 4c62357 · 4c62357
2 parents b50a539 + 7281211
commit 4c62357
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/errata/admin.py b/errata/admin.py
@@ -32,13 +32,13 @@ class Meta:
 class CustomExportResource(resources.ModelResource):
     location = Field(attribute='location', column_name='Location')
     detail = Field(attribute='detail', column_name='Detail')
-    resolution = Field(attribute='resolution', column_name='Resolution')
+    resolution_notes = Field(attribute='resolution_notes', column_name='Resolution Notes')
     error_type = Field(attribute='error_type', column_name='Error Type')
 
     class Meta:
         model = Errata
-        fields = ('location', 'detail', 'resolution', 'error_type')
-        export_order = ('location', 'detail', 'resolution', 'error_type')
+        fields = ('location', 'detail', 'resolution_notes', 'error_type')
+        export_order = ('location', 'detail', 'resolution_notes', 'error_type')
 
 def custom_export_action(modeladmin, request, queryset):
     resource = CustomExportResource()