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

Migrate Team.GetMember to Sync by default (#11141)

Browse Source 
* Team.GetMember to Sync

* fix govet:  declaration of err shadows declaration at line 250

* Requested change

* Requested change
This commit is contained in:
Rodrigo Villablanca Vásquez
2019-06-14 10:28:21 -04:00
committed by Jesús Espino
parent b61ded0ae4
commit 8c56a5f202
7 changed files with 76 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api4/apitestlib.go
View File

@@ -765,8 +765,7 @@ func (me *TestHelper) MakeUserChannelAdmin(user *model.User, channel *model.Chan
func (me *TestHelper) UpdateUserToTeamAdmin(user *model.User, team *model.Team) {
utils.DisableDebugLogForTest()
if tmr := <-me.App.Srv.Store.Team().GetMember(team.Id, user.Id); tmr.Err == nil {
tm := tmr.Data.(*model.TeamMember)
if tm, err := me.App.Srv.Store.Team().GetMember(team.Id, user.Id); err == nil {
tm.SchemeAdmin = true
if sr := <-me.App.Srv.Store.Team().UpdateMember(tm); sr.Err != nil {
utils.EnableDebugLogForTest()
@@ -774,10 +773,10 @@ func (me *TestHelper) UpdateUserToTeamAdmin(user *model.User, team *model.Team)
}
} else {
utils.EnableDebugLogForTest()
mlog.Error(tmr.Err.Error())
mlog.Error(err.Error())
time.Sleep(time.Second)
panic(tmr.Err)
panic(err)
}
utils.EnableDebugLogForTest()
@@ -786,8 +785,7 @@ func (me *TestHelper) UpdateUserToTeamAdmin(user *model.User, team *model.Team)
func (me *TestHelper) UpdateUserToNonTeamAdmin(user *model.User, team *model.Team) {
utils.DisableDebugLogForTest()
if tmr := <-me.App.Srv.Store.Team().GetMember(team.Id, user.Id); tmr.Err == nil {
tm := tmr.Data.(*model.TeamMember)
if tm, err := me.App.Srv.Store.Team().GetMember(team.Id, user.Id); err == nil {
tm.SchemeAdmin = false
if sr := <-me.App.Srv.Store.Team().UpdateMember(tm); sr.Err != nil {
utils.EnableDebugLogForTest()
@@ -795,10 +793,10 @@ func (me *TestHelper) UpdateUserToNonTeamAdmin(user *model.User, team *model.Tea
}
} else {
utils.EnableDebugLogForTest()
mlog.Error(tmr.Err.Error())
mlog.Error(err.Error())
time.Sleep(time.Second)
panic(tmr.Err)
panic(err)
}
utils.EnableDebugLogForTest()