From 04af4b24fd87bb2ee8a2a3cecd66c5c1b1e413dd Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 22 Oct 2015 14:47:24 -0400 Subject: [PATCH] work on #1818 --- gogs.go | 2 +- models/error.go | 6 +++--- models/pull.go | 10 ++++++---- templates/.VERSION | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gogs.go b/gogs.go index 8abca9f50..dc1cc000b 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.16.1018 Beta" +const APP_VER = "0.6.16.1022 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/error.go b/models/error.go index 1986c5902..f69732582 100644 --- a/models/error.go +++ b/models/error.go @@ -310,7 +310,7 @@ func (err ErrIssueNotExist) Error() string { type ErrPullRequestNotExist struct { ID int64 - PullID int64 + IssueID int64 HeadRepoID int64 BaseRepoID int64 HeadBarcnh string @@ -323,8 +323,8 @@ func IsErrPullRequestNotExist(err error) bool { } func (err ErrPullRequestNotExist) Error() string { - return fmt.Sprintf("pull request does not exist [id: %d, pull_id: %d, head_repo_id: %d, base_repo_id: %d, head_branch: %s, base_branch: %s]", - err.ID, err.PullID, err.HeadRepoID, err.BaseRepoID, err.HeadBarcnh, err.BaseBranch) + return fmt.Sprintf("pull request does not exist [id: %d, issue_id: %d, head_repo_id: %d, base_repo_id: %d, head_branch: %s, base_branch: %s]", + err.ID, err.IssueID, err.HeadRepoID, err.BaseRepoID, err.HeadBarcnh, err.BaseBranch) } // _________ __ diff --git a/models/pull.go b/models/pull.go index 8eb26ad77..142739b77 100644 --- a/models/pull.go +++ b/models/pull.go @@ -250,13 +250,15 @@ func GetUnmergedPullRequest(headRepoID, baseRepoID int64, headBranch, baseBranch } // GetPullRequestByIssueID returns pull request by given issue ID. -func GetPullRequestByIssueID(pullID int64) (*PullRequest, error) { - pr := new(PullRequest) - has, err := x.Where("pull_id=?", pullID).Get(pr) +func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) { + pr := &PullRequest{ + IssueID: issueID, + } + has, err := x.Get(pr) if err != nil { return nil, err } else if !has { - return nil, ErrPullRequestNotExist{0, pullID, 0, 0, "", ""} + return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""} } return pr, nil } diff --git a/templates/.VERSION b/templates/.VERSION index df1adfbcb..c7f062e51 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.16.1018 Beta \ No newline at end of file +0.6.16.1022 Beta \ No newline at end of file