diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-06-29 22:39:57 +0800 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-06-29 10:39:57 -0400 |
commit | 648f333850163efeac486c4b07eb47da415a9c98 (patch) | |
tree | 1b441666d3a58f39efb0cb5396ede217ed841c9a /model/config.go | |
parent | e1168ab7cc9770ab71fda6994ee80ef0e64e15d7 (diff) | |
download | chat-648f333850163efeac486c4b07eb47da415a9c98.tar.gz chat-648f333850163efeac486c4b07eb47da415a9c98.tar.bz2 chat-648f333850163efeac486c4b07eb47da415a9c98.zip |
[PLT-6496] Remove System Console and config settings for image height and width (#6688)
* remove System Console and config settings for image height and width
* add constants and update config.json
* updated as per review
Diffstat (limited to 'model/config.go')
-rw-r--r-- | model/config.go | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/model/config.go b/model/config.go index f2b17bced..90b3bd6c8 100644 --- a/model/config.go +++ b/model/config.go @@ -231,12 +231,6 @@ type FileSettings struct { Directory string EnablePublicLink bool PublicLinkSalt *string - ThumbnailWidth int - ThumbnailHeight int - PreviewWidth int - PreviewHeight int - ProfileWidth int - ProfileHeight int InitialFont string AmazonS3AccessKeyId string AmazonS3SecretAccessKey string @@ -1426,30 +1420,6 @@ func (o *Config) IsValid() *AppError { return NewLocAppError("Config.IsValid", "model.config.is_valid.file_driver.app_error", nil, "") } - if o.FileSettings.PreviewHeight < 0 { - return NewLocAppError("Config.IsValid", "model.config.is_valid.file_preview_height.app_error", nil, "") - } - - if o.FileSettings.PreviewWidth <= 0 { - return NewLocAppError("Config.IsValid", "model.config.is_valid.file_preview_width.app_error", nil, "") - } - - if o.FileSettings.ProfileHeight <= 0 { - return NewLocAppError("Config.IsValid", "model.config.is_valid.file_profile_height.app_error", nil, "") - } - - if o.FileSettings.ProfileWidth <= 0 { - return NewLocAppError("Config.IsValid", "model.config.is_valid.file_profile_width.app_error", nil, "") - } - - if o.FileSettings.ThumbnailHeight <= 0 { - return NewLocAppError("Config.IsValid", "model.config.is_valid.file_thumb_height.app_error", nil, "") - } - - if o.FileSettings.ThumbnailWidth <= 0 { - return NewLocAppError("Config.IsValid", "model.config.is_valid.file_thumb_width.app_error", nil, "") - } - if len(*o.FileSettings.PublicLinkSalt) < 32 { return NewLocAppError("Config.IsValid", "model.config.is_valid.file_salt.app_error", nil, "") } |