3 files changed, 7 insertions, 7 deletions
diff --git a/modules/context/context.go b/modules/context/context.go
index 348de325..6ca7e574 100644
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -156,7 +156,7 @@ func Contexter() macaron.Handler {
 			ctx.IsSigned = true
 			ctx.Data["IsSigned"] = ctx.IsSigned
 			ctx.Data["SignedUser"] = ctx.User
-			ctx.Data["SignedUserID"] = ctx.User.Id
+			ctx.Data["SignedUserID"] = ctx.User.ID
 			ctx.Data["SignedUserName"] = ctx.User.Name
 			ctx.Data["IsAdmin"] = ctx.User.IsAdmin
 		} else {
diff --git a/modules/context/org.go b/modules/context/org.go
index 4cacdf4a..f8fbf0c7 100644
--- a/modules/context/org.go
+++ b/modules/context/org.go
@@ -72,13 +72,13 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 		ctx.Org.IsTeamMember = true
 		ctx.Org.IsTeamAdmin = true
 	} else if ctx.IsSigned {
-		ctx.Org.IsOwner = org.IsOwnedBy(ctx.User.Id)
+		ctx.Org.IsOwner = org.IsOwnedBy(ctx.User.ID)
 		if ctx.Org.IsOwner {
 			ctx.Org.IsMember = true
 			ctx.Org.IsTeamMember = true
 			ctx.Org.IsTeamAdmin = true
 		} else {
-			if org.IsOrgMember(ctx.User.Id) {
+			if org.IsOrgMember(ctx.User.ID) {
 				ctx.Org.IsMember = true
 			}
 		}
@@ -105,7 +105,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 				return
 			}
 		} else {
-			if err := org.GetUserTeams(ctx.User.Id); err != nil {
+			if err := org.GetUserTeams(ctx.User.ID); err != nil {
 				ctx.Handle(500, "GetUserTeams", err)
 				return
 			}
diff --git a/modules/context/repo.go b/modules/context/repo.go
index f68576ff..94991327 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -122,7 +122,7 @@ func RepoAssignment(args ...bool) macaron.Handler {
 		ctx.Repo.Owner = owner
 
 		// Get repository.
-		repo, err := models.GetRepositoryByName(owner.Id, repoName)
+		repo, err := models.GetRepositoryByName(owner.ID, repoName)
 		if err != nil {
 			if models.IsErrRepoNotExist(err) {
 				ctx.Handle(404, "GetRepositoryByName", err)
@@ -198,8 +198,8 @@ func RepoAssignment(args ...bool) macaron.Handler {
 		ctx.Data["WikiCloneLink"] = repo.WikiCloneLink()
 
 		if ctx.IsSigned {
-			ctx.Data["IsWatchingRepo"] = models.IsWatching(ctx.User.Id, repo.ID)
-			ctx.Data["IsStaringRepo"] = models.IsStaring(ctx.User.Id, repo.ID)
+			ctx.Data["IsWatchingRepo"] = models.IsWatching(ctx.User.ID, repo.ID)
+			ctx.Data["IsStaringRepo"] = models.IsStaring(ctx.User.ID, repo.ID)
 		}
 
 		// repo is bare and display enable