diff options
| author | George Goldberg <george@gberg.me> | 2018-05-14 15:59:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-14 15:59:04 +0100 |
| commit | 51bd710ecdca6628461c9fa2679737073e4d5059 (patch) | |
| tree | b2a4837ced3ed515ee505728917a6630b0553f76 /app/scheme.go | |
| parent | 91557bbd978500388a11b99401783164e143a966 (diff) | |
| download | chat-51bd710ecdca6628461c9fa2679737073e4d5059.tar.gz chat-51bd710ecdca6628461c9fa2679737073e4d5059.tar.bz2 chat-51bd710ecdca6628461c9fa2679737073e4d5059.zip | |
MM-9728: Online migration for advanced permissions phase 2 (#8744)
* MM-9728: Online migration for advanced permissions phase 2
* Add unit tests for new store functions.
* Move migration specific code to own file.
* Add migration state function test.
* Style fixes.
* Add i18n strings.
* Fix mocks.
* Add TestMain to migrations package tests.
* Fix typo.
* Fix review comments.
* Fix up the "Check if migration is done" check to actually work.
Diffstat (limited to 'app/scheme.go')
| -rw-r--r-- | app/scheme.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/scheme.go b/app/scheme.go index b43914eb8..a8eb9ef46 100644 --- a/app/scheme.go +++ b/app/scheme.go @@ -3,7 +3,9 @@ package app -import "github.com/mattermost/mattermost-server/model" +import ( + "github.com/mattermost/mattermost-server/model" +) func (a *App) GetScheme(id string) (*model.Scheme, *model.AppError) { if result := <-a.Srv.Store.Scheme().Get(id); result.Err != nil { @@ -109,7 +111,9 @@ func (a *App) GetChannelsForScheme(scheme *model.Scheme, offset int, limit int) } func (a *App) IsPhase2MigrationCompleted() *model.AppError { - // TODO: Actually check the Phase 2 migration has completed before permitting these actions. + if result := <-a.Srv.Store.System().GetByName(model.MIGRATION_KEY_ADVANCED_PERMISSIONS_PHASE_2); result.Err != nil { + return result.Err + } return nil } |