diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 2d7d8730f0..b9a71982d0 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -13,7 +13,6 @@ import ( "time" "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" @@ -897,7 +896,7 @@ func EditIssue(ctx *context.APIContext) { oldMilestoneID := issue.MilestoneID issue.MilestoneID = *form.Milestone if issue.MilestoneID > 0 { - issue.Milestone, err = issue_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, *form.Milestone) + issue.Milestone, err = issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, *form.Milestone) if err != nil { ctx.APIErrorInternal(err) return diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index c04882ecc3..f1ba06dd4a 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -14,7 +14,6 @@ import ( activities_model "code.gitea.io/gitea/models/activities" git_model "code.gitea.io/gitea/models/git" - issue_model "code.gitea.io/gitea/models/issues" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" pull_model "code.gitea.io/gitea/models/pull" @@ -707,7 +706,7 @@ func EditPullRequest(ctx *context.APIContext) { issue.MilestoneID != form.Milestone { oldMilestoneID := issue.MilestoneID issue.MilestoneID = form.Milestone - issue.Milestone, err = issue_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, form.Milestone) + issue.Milestone, err = issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, form.Milestone) if err != nil { ctx.APIErrorInternal(err) return diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 7e5331bf3e..4275b5fb74 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -13,7 +13,6 @@ import ( "strings" "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" @@ -421,7 +420,7 @@ func UpdateIssueMilestone(ctx *context.Context) { issue.MilestoneID = milestoneID if milestoneID > 0 { var err error - issue.Milestone, err = issue_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, milestoneID) + issue.Milestone, err = issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, milestoneID) if err != nil { ctx.ServerError("GetMileStoneByID", err) return diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index ce4064435b..9cecef5beb 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -187,7 +187,7 @@ func testIssueAddComment(t *testing.T, session *TestSession, issueURL, content, func testIssueChangeMilestone(t *testing.T, session *TestSession, repoLink string, issueID, milestoneID int64) { req := NewRequestWithValues(t, "POST", fmt.Sprintf(repoLink+"/issues/milestone?issue_ids=%d", issueID), map[string]string{ "_csrf": GetUserCSRFToken(t, session), - "id": fmt.Sprintf("%d", milestoneID), + "id": strconv.FormatInt(milestoneID, 64), }) resp := session.MakeRequest(t, req, http.StatusOK) assert.Equal(t, `{"ok":true}`, strings.TrimSpace(resp.Body.String()))