diff options
Diffstat (limited to 'routers/web/repo/pull.go')
| -rw-r--r-- | routers/web/repo/pull.go | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 9c9cf0f21d..dde5561351 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -1322,29 +1322,16 @@ func DownloadPullPatch(ctx *context.Context) { // DownloadPullDiffOrPatch render a pull's raw diff or patch func DownloadPullDiffOrPatch(ctx *context.Context, patch bool) { - issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + pr, err := models.GetPullRequestByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { - if models.IsErrIssueNotExist(err) { - ctx.NotFound("GetIssueByIndex", err) + if models.IsErrPullRequestNotExist(err) { + ctx.NotFound("GetPullRequestByIndex", err) } else { - ctx.ServerError("GetIssueByIndex", err) + ctx.ServerError("GetPullRequestByIndex", err) } return } - // Return not found if it's not a pull request - if !issue.IsPull { - ctx.NotFound("DownloadPullDiff", - fmt.Errorf("Issue is not a pull request")) - return - } - - if err = issue.LoadPullRequest(); err != nil { - ctx.ServerError("LoadPullRequest", err) - return - } - - pr := issue.PullRequest binary := ctx.FormBool("binary") if err := pull_service.DownloadDiffOrPatch(pr, ctx, patch, binary); err != nil { |