summaryrefslogtreecommitdiffstats
path: root/app/import_types.go
diff options
context:
space:
mode:
authorFurmanovD <39990503+FurmanovD@users.noreply.github.com>2018-09-17 13:46:06 +0300
committerGeorge Goldberg <george@gberg.me>2018-09-17 11:46:06 +0100
commit517faccc332ce48de43e597d1b2d29a3961241e7 (patch)
tree38470bb23b9547b8efca92d3341dd023f5f2e999 /app/import_types.go
parent35c148d2551bbb65a6d469b44876ba78578397c1 (diff)
downloadchat-517faccc332ce48de43e597d1b2d29a3961241e7.tar.gz
chat-517faccc332ce48de43e597d1b2d29a3961241e7.tar.bz2
chat-517faccc332ce48de43e597d1b2d29a3961241e7.zip
MM-11424 Extend bulk import to support themes across teams(#9305) (#9419)
* MM-11424 Extend bulk import to support themes across teams(#9305) Also added: Advanced Settings: +'feature_enabled_markdown_preview' +'formatting' Sidebar Settings: +'show_unread_section' * MM-11424 (PR review) user teams' theme validator test updated * MM-11424 (PR review) added test with valid JSON of invalid theme(by structure) JSON string contains numeric and JSON object fields, not just a correct "string":"string" map
Diffstat (limited to 'app/import_types.go')
-rw-r--r--app/import_types.go28
1 files changed, 16 insertions, 12 deletions
diff --git a/app/import_types.go b/app/import_types.go
index 7d53e5b16..168d43bab 100644
--- a/app/import_types.go
+++ b/app/import_types.go
@@ -40,18 +40,21 @@ type ChannelImportData struct {
}
type UserImportData struct {
- ProfileImage *string `json:"profile_image"`
- Username *string `json:"username"`
- Email *string `json:"email"`
- AuthService *string `json:"auth_service"`
- AuthData *string `json:"auth_data"`
- Password *string `json:"password"`
- Nickname *string `json:"nickname"`
- FirstName *string `json:"first_name"`
- LastName *string `json:"last_name"`
- Position *string `json:"position"`
- Roles *string `json:"roles"`
- Locale *string `json:"locale"`
+ ProfileImage *string `json:"profile_image"`
+ Username *string `json:"username"`
+ Email *string `json:"email"`
+ AuthService *string `json:"auth_service"`
+ AuthData *string `json:"auth_data"`
+ Password *string `json:"password"`
+ Nickname *string `json:"nickname"`
+ FirstName *string `json:"first_name"`
+ LastName *string `json:"last_name"`
+ Position *string `json:"position"`
+ Roles *string `json:"roles"`
+ Locale *string `json:"locale"`
+ UseMarkdownPreview *string `json:"feature_enabled_markdown_preview"`
+ UseFormatting *string `json:"formatting"`
+ ShowUnreadSection *string `json:"show_unread_section"`
Teams *[]UserTeamImportData `json:"teams"`
@@ -82,6 +85,7 @@ type UserNotifyPropsImportData struct {
type UserTeamImportData struct {
Name *string `json:"name"`
Roles *string `json:"roles"`
+ Theme *string `json:"theme"`
Channels *[]UserChannelImportData `json:"channels"`
}