diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-23 15:04:22 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-23 15:04:22 -0400 |
| commit | 15f15de8ca5ee91e5d11ed017ba0e3d49b1471ec (patch) | |
| tree | c410bad529a7d968a08e3b4e01cf3e9631eb47d1 /model | |
| parent | 301706f2558d55271275273dec0de1fb86082f8a (diff) | |
| parent | e4a15076f458be1416de25b2c45578975b914de5 (diff) | |
| download | chat-15f15de8ca5ee91e5d11ed017ba0e3d49b1471ec.tar.gz chat-15f15de8ca5ee91e5d11ed017ba0e3d49b1471ec.tar.bz2 chat-15f15de8ca5ee91e5d11ed017ba0e3d49b1471ec.zip | |
Merge pull request #759 from mattermost/plt-242-3
PLT-242 Implement custom UI theme colors.
Diffstat (limited to 'model')
| -rw-r--r-- | model/user.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/model/user.go b/model/user.go index fdc519b99..3a2c9d56c 100644 --- a/model/user.go +++ b/model/user.go @@ -47,6 +47,7 @@ type User struct { AllowMarketing bool `json:"allow_marketing"` Props StringMap `json:"props"` NotifyProps StringMap `json:"notify_props"` + ThemeProps StringMap `json:"theme_props"` LastPasswordUpdate int64 `json:"last_password_update"` LastPictureUpdate int64 `json:"last_picture_update"` FailedAttempts int `json:"failed_attempts"` @@ -108,6 +109,10 @@ func (u *User) IsValid() *AppError { return NewAppError("User.IsValid", "Invalid user, password and auth data cannot both be set", "user_id="+u.Id) } + if len(u.ThemeProps) > 2000 { + return NewAppError("User.IsValid", "Invalid theme", "user_id="+u.Id) + } + return nil } |