diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
| commit | 5fa1b3581955761bd39c310bc88b1489d963a9fc (patch) | |
| tree | 25e6dd11592102807abebbb5de100f7d867005d8 /api4/team.go | |
| parent | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (diff) | |
| parent | 87762ae62eb887dfb3fd0957040919aede46f7d4 (diff) | |
| download | chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.gz chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.bz2 chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'api4/team.go')
| -rw-r--r-- | api4/team.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api4/team.go b/api4/team.go index 8e4c5c312..f8a1c556c 100644 --- a/api4/team.go +++ b/api4/team.go @@ -285,7 +285,7 @@ func getTeamMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } - if members, err := c.App.GetTeamMembers(c.Params.TeamId, c.Params.Page, c.Params.PerPage); err != nil { + if members, err := c.App.GetTeamMembers(c.Params.TeamId, c.Params.Page*c.Params.PerPage, c.Params.PerPage); err != nil { c.Err = err return } else { @@ -543,9 +543,9 @@ func getAllTeams(c *Context, w http.ResponseWriter, r *http.Request) { var err *model.AppError if c.App.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { - teams, err = c.App.GetAllTeamsPage(c.Params.Page, c.Params.PerPage) + teams, err = c.App.GetAllTeamsPage(c.Params.Page*c.Params.PerPage, c.Params.PerPage) } else { - teams, err = c.App.GetAllOpenTeamsPage(c.Params.Page, c.Params.PerPage) + teams, err = c.App.GetAllOpenTeamsPage(c.Params.Page*c.Params.PerPage, c.Params.PerPage) } if err != nil { |