@@ -694,6 +694,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 |
@@ -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)) |
@@ -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> |