MM-14811: Accepts Server rather than App in account migration interface registration. (#10568)

Этот коммит содержится в:
Martin Kraft
2019-04-10 06:04:07 -04:00
коммит произвёл GitHub
родитель 2d4d19837b
Коммит bd8a54bb08

Просмотреть файл

@@ -11,9 +11,9 @@ import (
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/model"
) )
var accountMigrationInterface func(*App) einterfaces.AccountMigrationInterface var accountMigrationInterface func(*Server) einterfaces.AccountMigrationInterface
func RegisterAccountMigrationInterface(f func(*App) einterfaces.AccountMigrationInterface) { func RegisterAccountMigrationInterface(f func(*Server) einterfaces.AccountMigrationInterface) {
accountMigrationInterface = f accountMigrationInterface = f
} }
@@ -109,7 +109,7 @@ func RegisterSamlInterface(f func(*App) einterfaces.SamlInterface) {
func (s *Server) initEnterprise() { func (s *Server) initEnterprise() {
if accountMigrationInterface != nil { if accountMigrationInterface != nil {
s.AccountMigration = accountMigrationInterface(s.FakeApp()) s.AccountMigration = accountMigrationInterface(s)
} }
if complianceInterface != nil { if complianceInterface != nil {
s.Compliance = complianceInterface(s.FakeApp()) s.Compliance = complianceInterface(s.FakeApp())