diff options
Diffstat (limited to 'model')
-rw-r--r-- | model/config.go | 3 | ||||
-rw-r--r-- | model/message_export.go | 16 |
2 files changed, 13 insertions, 6 deletions
diff --git a/model/config.go b/model/config.go index 0931cff87..868bb01d5 100644 --- a/model/config.go +++ b/model/config.go @@ -156,6 +156,7 @@ const ( TIMEZONE_SETTINGS_DEFAULT_SUPPORTED_TIMEZONES_PATH = "timezones.json" + COMPLIANCE_EXPORT_TYPE_CSV = "csv" COMPLIANCE_EXPORT_TYPE_ACTIANCE = "actiance" COMPLIANCE_EXPORT_TYPE_GLOBALRELAY = "globalrelay" GLOBALRELAY_CUSTOMER_TYPE_A9 = "A9" @@ -2366,7 +2367,7 @@ func (mes *MessageExportSettings) isValid(fs FileSettings) *AppError { return NewAppError("Config.IsValid", "model.config.is_valid.message_export.daily_runtime.app_error", nil, err.Error(), http.StatusBadRequest) } else if mes.BatchSize == nil || *mes.BatchSize < 0 { return NewAppError("Config.IsValid", "model.config.is_valid.message_export.batch_size.app_error", nil, "", http.StatusBadRequest) - } else if mes.ExportFormat == nil || (*mes.ExportFormat != COMPLIANCE_EXPORT_TYPE_ACTIANCE && *mes.ExportFormat != COMPLIANCE_EXPORT_TYPE_GLOBALRELAY) { + } else if mes.ExportFormat == nil || (*mes.ExportFormat != COMPLIANCE_EXPORT_TYPE_ACTIANCE && *mes.ExportFormat != COMPLIANCE_EXPORT_TYPE_GLOBALRELAY && *mes.ExportFormat != COMPLIANCE_EXPORT_TYPE_CSV) { return NewAppError("Config.IsValid", "model.config.is_valid.message_export.export_type.app_error", nil, "", http.StatusBadRequest) } diff --git a/model/message_export.go b/model/message_export.go index 6efb8c6a4..7ac50db25 100644 --- a/model/message_export.go +++ b/model/message_export.go @@ -4,7 +4,12 @@ package model type MessageExport struct { + TeamId *string + TeamName *string + TeamDisplayName *string + ChannelId *string + ChannelName *string ChannelDisplayName *string ChannelType *string @@ -12,9 +17,10 @@ type MessageExport struct { UserEmail *string Username *string - PostId *string - PostCreateAt *int64 - PostMessage *string - PostType *string - PostFileIds StringArray + PostId *string + PostCreateAt *int64 + PostMessage *string + PostType *string + PostOriginalId *string + PostFileIds StringArray } |