From a1e17fe78a14e89a669b15a0b806fa73892db6f6 Mon Sep 17 00:00:00 2001 From: Hossein Ahmadian-Yazdi Date: Thu, 24 Sep 2020 11:49:57 -0400 Subject: [PATCH] MM-28530 - Changes are not automatically propagated to system console when a permission is added/removed from a role (#15562) * send event for when role updates!!! * address PR comments --- app/role.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/role.go b/app/role.go index 2492cce9f8..4b972f495d 100644 --- a/app/role.go +++ b/app/role.go @@ -125,6 +125,8 @@ func (a *App) PatchRole(role *model.Role, patch *model.RolePatch) (*model.Role, return nil, err } + a.sendUpdatedRoleEvent(role) + return role, err } @@ -169,7 +171,7 @@ func (a *App) UpdateRole(role *model.Role) (*model.Role, *model.AppError) { model.CHANNEL_ADMIN_ROLE_ID, } - builtInRolesMinusChannelRoles := utils.RemoveStringsFromSlice(model.BuiltInSchemeManagedRoleIDs, builtInChannelRoles...) + builtInRolesMinusChannelRoles := append(utils.RemoveStringsFromSlice(model.BuiltInSchemeManagedRoleIDs, builtInChannelRoles...), model.NewSystemRoleIDs...) if utils.StringInSlice(savedRole.Name, builtInRolesMinusChannelRoles) { return savedRole, nil @@ -209,7 +211,9 @@ func (a *App) UpdateRole(role *model.Role) (*model.Role, *model.AppError) { } for _, ir := range impactedRoles { - a.sendUpdatedRoleEvent(ir) + if ir.Name != role.Name { + a.sendUpdatedRoleEvent(ir) + } } return savedRole, nil