From fb7c23f911bebcb72f170f3d8bc8343546805f3b Mon Sep 17 00:00:00 2001
From: guillep2k <18600385+guillep2k@users.noreply.github.com>
Date: Fri, 4 Oct 2019 23:09:19 -0300
Subject: [PATCH] Fix editor commit to new branch if PR disabled (#8375)
---
options/locale/locale_en-US.ini | 1 +
routers/repo/editor.go | 6 +++---
templates/repo/editor/commit_form.tmpl | 14 ++++++++++++--
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 938c53af3f..c8be059b72 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -706,6 +706,7 @@ editor.delete = Delete '%s'
editor.commit_message_desc = Add an optional extended description…
editor.commit_directly_to_this_branch = Commit directly to the <strong class="branch-name">%s</strong> branch.
editor.create_new_branch = Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.create_new_branch_np = Create a <strong>new branch</strong> for this commit.
editor.propose_file_change = Propose file change
editor.new_branch_name_desc = New branch name…
editor.cancel = Cancel
diff --git a/routers/repo/editor.go b/routers/repo/editor.go
index 68b94662dc..d4a7dab074 100644
--- a/routers/repo/editor.go
+++ b/routers/repo/editor.go
@@ -269,7 +269,7 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo
}
}
- if form.CommitChoice == frmCommitChoiceNewBranch {
+ if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(models.UnitTypePullRequests) {
ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + ctx.Repo.BranchName + "..." + form.NewBranchName)
} else {
ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(form.TreePath))
@@ -434,7 +434,7 @@ func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) {
}
ctx.Flash.Success(ctx.Tr("repo.editor.file_delete_success", ctx.Repo.TreePath))
- if form.CommitChoice == frmCommitChoiceNewBranch {
+ if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(models.UnitTypePullRequests) {
ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + ctx.Repo.BranchName + "..." + form.NewBranchName)
} else {
treePath := filepath.Dir(ctx.Repo.TreePath)
@@ -589,7 +589,7 @@ func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) {
return
}
- if form.CommitChoice == frmCommitChoiceNewBranch {
+ if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(models.UnitTypePullRequests) {
ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + ctx.Repo.BranchName + "..." + form.NewBranchName)
} else {
ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(form.TreePath))
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl
index d22cd07b03..2ff08e3931 100644
--- a/templates/repo/editor/commit_form.tmpl
+++ b/templates/repo/editor/commit_form.tmpl
@@ -19,11 +19,21 @@
</div>
</div>
<div class="field">
+ {{$pullRequestEnabled := .Repository.UnitEnabled $.UnitTypePullRequests}}
+ {{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
<div class="ui radio checkbox">
- <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.i18n.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
+ {{if $pullRequestEnabled}}
+ <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.i18n.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
+ {{else}}
+ <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.i18n.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
+ {{end}}
<label>
<i class="octicon octicon-git-pull-request" height="16" width="12"></i>
- {{.i18n.Tr "repo.editor.create_new_branch" | Safe}}
+ {{if $pullRequestEnabled}}
+ {{.i18n.Tr "repo.editor.create_new_branch" | Safe}}
+ {{else}}
+ {{.i18n.Tr "repo.editor.create_new_branch_np" | Safe}}
+ {{end}}
</label>
</div>
</div>