PLT-4113 Added default for FileSettings.Directory (#6188)

This commit is contained in:
Justin Wyer
2017-04-25 18:37:57 +02:00
committed by Corey Hulen
parent f1668bad15
commit 83ca76f8f2
2 changed files with 21 additions and 0 deletions

View File

@@ -487,6 +487,10 @@ func (o *Config) SetDefaults() {
o.FileSettings.InitialFont = "luximbi.ttf"
}
if o.FileSettings.Directory == "" {
o.FileSettings.Directory = "./data/"
}
if len(o.EmailSettings.InviteSalt) == 0 {
o.EmailSettings.InviteSalt = NewRandomString(32)
}

17
model/config_test.go Normal file
View File

@@ -0,0 +1,17 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
import (
"testing"
)
func TestConfigDefaultFileSettingsDirectory(t *testing.T) {
c1 := Config{}
c1.SetDefaults()
if c1.FileSettings.Directory != "./data/" {
t.Fatal("FileSettings.Directory should default to './data/'")
}
}