MM-10424: Migrate PostEditTimeLimit config setting. (#8702)
Этот коммит содержится в:
коммит произвёл
Derrick Anderson
родитель
d6537deb3d
Коммит
62898f4892
@@ -560,6 +560,14 @@ func (a *App) DoAdvancedPermissionsMigration() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
config := a.Config()
|
||||||
|
if *config.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_ALWAYS {
|
||||||
|
*config.ServiceSettings.PostEditTimeLimit = -1
|
||||||
|
if err := a.SaveConfig(config, true); err != nil {
|
||||||
|
mlog.Error("Failed to update config in Advanced Permissions Phase 1 Migration.", mlog.String("error", err.Error()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
system := model.System{
|
system := model.System{
|
||||||
Name: ADVANCED_PERMISSIONS_MIGRATION_KEY,
|
Name: ADVANCED_PERMISSIONS_MIGRATION_KEY,
|
||||||
Value: "true",
|
Value: "true",
|
||||||
|
|||||||
@@ -426,4 +426,32 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) {
|
|||||||
assert.Nil(t, err)
|
assert.Nil(t, err)
|
||||||
assert.Equal(t, permissions, role.Permissions)
|
assert.Equal(t, permissions, role.Permissions)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check that the config setting for "always" and "time_limit" edit posts is updated correctly.
|
||||||
|
th.ResetRoleMigration()
|
||||||
|
|
||||||
|
config := th.App.GetConfig()
|
||||||
|
*config.ServiceSettings.AllowEditPost = "always"
|
||||||
|
*config.ServiceSettings.PostEditTimeLimit = 300
|
||||||
|
th.App.SaveConfig(config, false)
|
||||||
|
|
||||||
|
th.App.DoAdvancedPermissionsMigration()
|
||||||
|
config = th.App.GetConfig()
|
||||||
|
assert.Equal(t, -1, *config.ServiceSettings.PostEditTimeLimit)
|
||||||
|
|
||||||
|
th.ResetRoleMigration()
|
||||||
|
|
||||||
|
config = th.App.GetConfig()
|
||||||
|
*config.ServiceSettings.AllowEditPost = "time_limit"
|
||||||
|
*config.ServiceSettings.PostEditTimeLimit = 300
|
||||||
|
th.App.SaveConfig(config, false)
|
||||||
|
|
||||||
|
th.App.DoAdvancedPermissionsMigration()
|
||||||
|
config = th.App.GetConfig()
|
||||||
|
assert.Equal(t, 300, *config.ServiceSettings.PostEditTimeLimit)
|
||||||
|
|
||||||
|
config = th.App.GetConfig()
|
||||||
|
*config.ServiceSettings.AllowEditPost = "always"
|
||||||
|
*config.ServiceSettings.PostEditTimeLimit = 300
|
||||||
|
th.App.SaveConfig(config, false)
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user