summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-25 11:30:16 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-25 11:30:16 -0400
commit123f33d05c805ecdea342d43769fb48d2e0f51dd (patch)
treec155ba04d7e07d70e35e17988c78bb155e10c023
parentbaf697e348e329ad6b5c5bba1db8e0a53fcb8a13 (diff)
parentf1cd33c8220d6702d9358a0c1eed459807781210 (diff)
downloadchat-123f33d05c805ecdea342d43769fb48d2e0f51dd.tar.gz
chat-123f33d05c805ecdea342d43769fb48d2e0f51dd.tar.bz2
chat-123f33d05c805ecdea342d43769fb48d2e0f51dd.zip
Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermost-server into advanced-permissions-phase-2
-rw-r--r--store/sqlstore/scheme_supplier.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/store/sqlstore/scheme_supplier.go b/store/sqlstore/scheme_supplier.go
index 776ca9130..f272040a6 100644
--- a/store/sqlstore/scheme_supplier.go
+++ b/store/sqlstore/scheme_supplier.go
@@ -160,6 +160,9 @@ func (s *SqlSupplier) createScheme(ctx context.Context, scheme *model.Scheme, tr
}
scheme.Id = model.NewId()
+ if len(scheme.Name) == 0 {
+ scheme.Name = model.NewId()
+ }
scheme.CreateAt = model.GetMillis()
scheme.UpdateAt = scheme.CreateAt