Merge remote-tracking branch 'upstream/main' into compliance-history-…

…export
mattermost-community · Jan 2, 2023 · 95d099e · 95d099e
2 parents a8baf0c + bad0e5b
commit 95d099e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/webapp/src/csvExporter.ts b/webapp/src/csvExporter.ts
@@ -78,8 +78,14 @@ class CsvExporter {
             const row: string[] = []
             row.push(`"${this.encodeText(card.title)}"`)
             visibleProperties.forEach((template: IPropertyTemplate) => {
-                const propertyValue = card.fields.properties[template.id]
+                let propertyValue = card.fields.properties[template.id]
                 const property = propsRegistry.get(template.type)
+                if (property.type === 'createdBy') {
+                    propertyValue = card.createdBy
+                }
+                if (property.type === 'updatedBy') {
+                    propertyValue = card.modifiedBy
+                }
                 row.push(property.exportValue(propertyValue, card, template, intl))
             })
             rows.push(row)