1 files changed, 26 insertions, 26 deletions

diff --git a/models/issue.go b/models/issue.go
index 1e528d86..39969c71 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -38,7 +38,7 @@ type Issue struct {
 	Repo            *Repository `xorm:"-"`
 	PosterID        int64
 	Poster          *User    `xorm:"-"`
-	LabelIds        string   `xorm:"TEXT"`
+	LabelIDs        string   `xorm:"label_ids TEXT"`
 	Labels          []*Label `xorm:"-"`
 	MilestoneID     int64
 	Milestone       *Milestone `xorm:"-"`
@@ -68,7 +68,7 @@ func (i *Issue) AfterSet(colName string, _ xorm.Cell) {
 }
 
 func (i *Issue) GetPoster() (err error) {
-	i.Poster, err = GetUserById(i.PosterID)
+	i.Poster, err = GetUserByID(i.PosterID)
 	if IsErrUserNotExist(err) {
 		i.Poster = &User{Name: "FakeUser"}
 		return nil
@@ -77,11 +77,11 @@ func (i *Issue) GetPoster() (err error) {
 }
 
 func (i *Issue) GetLabels() error {
-	if len(i.LabelIds) < 3 {
+	if len(i.LabelIDs) < 3 {
 		return nil
 	}
 
-	strIds := strings.Split(strings.TrimSuffix(i.LabelIds[1:], "|"), "|$")
+	strIds := strings.Split(strings.TrimSuffix(i.LabelIDs[1:], "|"), "|$")
 	i.Labels = make([]*Label, 0, len(strIds))
 	for _, strId := range strIds {
 		id := com.StrTo(strId).MustInt64()
@@ -104,7 +104,7 @@ func (i *Issue) GetAssignee() (err error) {
 		return nil
 	}
 
-	i.Assignee, err = GetUserById(i.AssigneeID)
+	i.Assignee, err = GetUserByID(i.AssigneeID)
 	if IsErrUserNotExist(err) {
 		return nil
 	}
@@ -134,7 +134,7 @@ func NewIssue(issue *Issue) (err error) {
 
 	if _, err = sess.Insert(issue); err != nil {
 		return err
-	} else if _, err = sess.Exec("UPDATE `repository` SET num_issues = num_issues + 1 WHERE id = ?", issue.RepoID); err != nil {
+	} else if _, err = sess.Exec("UPDATE `repository` SET num_issues=num_issues+1 WHERE id=?", issue.RepoID); err != nil {
 		return err
 	}
 
@@ -170,7 +170,7 @@ func GetIssueByRef(ref string) (issue *Issue, err error) {
 		return
 	}
 
-	return GetIssueByIndex(repo.Id, issueNumber)
+	return GetIssueByIndex(repo.ID, issueNumber)
 }
 
 // GetIssueByIndex returns issue by given index in repository.
@@ -296,45 +296,45 @@ type IssueUser struct {
 
 // FIXME: organization
 // NewIssueUserPairs adds new issue-user pairs for new issue of repository.
-func NewIssueUserPairs(repo *Repository, issueID, orgID, posterID, assigneeID int64) error {
+func NewIssueUserPairs(repo *Repository, issue *Issue) error {
 	users, err := repo.GetCollaborators()
 	if err != nil {
 		return err
 	}
 
 	iu := &IssueUser{
-		IssueId: issueID,
-		RepoId:  repo.Id,
+		IssueId: issue.ID,
+		RepoId:  repo.ID,
 	}
 
 	isNeedAddPoster := true
 	for _, u := range users {
 		iu.Id = 0
 		iu.Uid = u.Id
-		iu.IsPoster = iu.Uid == posterID
+		iu.IsPoster = iu.Uid == issue.PosterID
 		if isNeedAddPoster && iu.IsPoster {
 			isNeedAddPoster = false
 		}
-		iu.IsAssigned = iu.Uid == assigneeID
+		iu.IsAssigned = iu.Uid == issue.AssigneeID
 		if _, err = x.Insert(iu); err != nil {
 			return err
 		}
 	}
 	if isNeedAddPoster {
 		iu.Id = 0
-		iu.Uid = posterID
+		iu.Uid = issue.PosterID
 		iu.IsPoster = true
-		iu.IsAssigned = iu.Uid == assigneeID
+		iu.IsAssigned = iu.Uid == issue.AssigneeID
 		if _, err = x.Insert(iu); err != nil {
 			return err
 		}
 	}
 
 	// Add owner's as well.
-	if repo.OwnerId != posterID {
+	if repo.OwnerID != issue.PosterID {
 		iu.Id = 0
-		iu.Uid = repo.OwnerId
-		iu.IsAssigned = iu.Uid == assigneeID
+		iu.Uid = repo.OwnerID
+		iu.IsAssigned = iu.Uid == issue.AssigneeID
 		if _, err = x.Insert(iu); err != nil {
 			return err
 		}
@@ -621,7 +621,7 @@ func DeleteLabel(repoID, labelID int64) error {
 	}
 
 	for _, issue := range issues {
-		issue.LabelIds = strings.Replace(issue.LabelIds, "$"+com.ToStr(labelID)+"|", "", -1)
+		issue.LabelIDs = strings.Replace(issue.LabelIDs, "$"+com.ToStr(labelID)+"|", "", -1)
 		if _, err = sess.Id(issue.ID).AllCols().Update(issue); err != nil {
 			return err
 		}
@@ -768,7 +768,7 @@ func MilestoneStats(repoID int64) (open int64, closed int64) {
 
 // ChangeMilestoneStatus changes the milestone open/closed status.
 func ChangeMilestoneStatus(m *Milestone, isClosed bool) (err error) {
-	repo, err := GetRepositoryById(m.RepoID)
+	repo, err := GetRepositoryByID(m.RepoID)
 	if err != nil {
 		return err
 	}
@@ -784,9 +784,9 @@ func ChangeMilestoneStatus(m *Milestone, isClosed bool) (err error) {
 		return err
 	}
 
-	repo.NumMilestones = int(countRepoMilestones(sess, repo.Id))
-	repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.Id))
-	if _, err = sess.Id(repo.Id).AllCols().Update(repo); err != nil {
+	repo.NumMilestones = int(countRepoMilestones(sess, repo.ID))
+	repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.ID))
+	if _, err = sess.Id(repo.ID).AllCols().Update(repo); err != nil {
 		return err
 	}
 	return sess.Commit()
@@ -886,7 +886,7 @@ func DeleteMilestoneByID(mid int64) error {
 		return err
 	}
 
-	repo, err := GetRepositoryById(m.RepoID)
+	repo, err := GetRepositoryByID(m.RepoID)
 	if err != nil {
 		return err
 	}
@@ -901,9 +901,9 @@ func DeleteMilestoneByID(mid int64) error {
 		return err
 	}
 
-	repo.NumMilestones = int(countRepoMilestones(sess, repo.Id))
-	repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.Id))
-	if _, err = sess.Id(repo.Id).AllCols().Update(repo); err != nil {
+	repo.NumMilestones = int(countRepoMilestones(sess, repo.ID))
+	repo.NumClosedMilestones = int(countRepoClosedMilestones(sess, repo.ID))
+	if _, err = sess.Id(repo.ID).AllCols().Update(repo); err != nil {
 		return err
 	}