From 1f2e173a745da8e4b57f96b5561a3c10054d3b76 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 24 Jul 2016 01:08:22 +0800 Subject: Refactor User.Id to User.ID --- routers/api/v1/admin/org_team.go | 6 +++--- routers/api/v1/admin/user.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'routers/api/v1/admin') diff --git a/routers/api/v1/admin/org_team.go b/routers/api/v1/admin/org_team.go index 9b5411b1..c0f3487e 100644 --- a/routers/api/v1/admin/org_team.go +++ b/routers/api/v1/admin/org_team.go @@ -15,7 +15,7 @@ import ( func CreateTeam(ctx *context.APIContext, form api.CreateTeamOption) { team := &models.Team{ - OrgID: ctx.Org.Organization.Id, + OrgID: ctx.Org.Organization.ID, Name: form.Name, Description: form.Description, Authorize: models.ParseAccessMode(form.Permission), @@ -37,7 +37,7 @@ func AddTeamMember(ctx *context.APIContext) { if ctx.Written() { return } - if err := ctx.Org.Team.AddMember(u.Id); err != nil { + if err := ctx.Org.Team.AddMember(u.ID); err != nil { ctx.Error(500, "AddMember", err) return } @@ -51,7 +51,7 @@ func RemoveTeamMember(ctx *context.APIContext) { return } - if err := ctx.Org.Team.RemoveMember(u.Id); err != nil { + if err := ctx.Org.Team.RemoveMember(u.ID); err != nil { ctx.Error(500, "RemoveMember", err) return } diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 4bb24998..b282ce32 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -147,5 +147,5 @@ func CreatePublicKey(ctx *context.APIContext, form api.CreateKeyOption) { if ctx.Written() { return } - user.CreateUserPublicKey(ctx, form, u.Id) + user.CreateUserPublicKey(ctx, form, u.ID) } -- cgit v1.2.3