IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-7978 Add websocket event for user role update (#7745)

Browse Source 
* Add websocket event for user role update

* Fix tests

* More test fixes
This commit is contained in:
Joram Wilander
2017-10-31 12:00:21 -04:00
committed by George Goldberg
parent 6886de04d4
commit 06ec648cf3
15 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/platform/roles.go
View File

@@ -52,7 +52,7 @@ func makeSystemAdminCmdF(cmd *cobra.Command, args []string) error {
return errors.New("Unable to find user '" + args[i] + "'")
}
if _, err := a.UpdateUserRoles(user.Id, "system_admin system_user"); err != nil {
if _, err := a.UpdateUserRoles(user.Id, "system_admin system_user", true); err != nil {
return err
}
}
@@ -76,7 +76,7 @@ func makeMemberCmdF(cmd *cobra.Command, args []string) error {
return errors.New("Unable to find user '" + args[i] + "'")
}
if _, err := a.UpdateUserRoles(user.Id, "system_user"); err != nil {
if _, err := a.UpdateUserRoles(user.Id, "system_user", true); err != nil {
return err
}
}

2
cmd/platform/user.go
View File

@@ -246,7 +246,7 @@ func userCreateCmdF(cmd *cobra.Command, args []string) error {
if ruser, err := a.CreateUser(user); err != nil {
return errors.New("Unable to create user. Error: " + err.Error())
} else if systemAdmin {
a.UpdateUserRoles(ruser.Id, "system_user system_admin")
a.UpdateUserRoles(ruser.Id, "system_user system_admin", false)
}
CommandPrettyPrintln("Created User")