Prefer creating PR for base, disable editing default branch in fork

Author: brechtvl

routers/web/repo/editor.go

@@ -53,6 +53,7 @@ func renderCommitRights(ctx *context.Context) bool {
 	}
 	ctx.Data["CanCommitToBranch"] = canCommitToBranch
 	ctx.Data["CanCreatePullRequest"] = ctx.Repo.Repository.UnitEnabled(ctx, unit.TypePullRequests) || canCreateBasePullRequest(ctx)
+	ctx.Data["IsForkDefaultBranch"] = canCreateBasePullRequest(ctx) && ctx.Repo.BranchName == ctx.Repo.Repository.BaseRepo.DefaultBranch
 
 	return canCommitToBranch.CanCommitToBranch
 }
@@ -62,13 +63,13 @@ func redirectToPullRequest(ctx *context.Context, newBranchName string) bool {
 	repo := ctx.Repo.Repository
 	baseBranch := util.PathEscapeSegments(ctx.Repo.BranchName)
 	headBranch := util.PathEscapeSegments(newBranchName)
-	if !repo.UnitEnabled(ctx, unit.TypePullRequests) {
-		if !canCreateBasePullRequest(ctx) {
-			return false
-		}
+	if repo.UnitEnabled(ctx, unit.TypePullRequests) {
+	} else if canCreateBasePullRequest(ctx) {
 		baseBranch = util.PathEscapeSegments(repo.BaseRepo.DefaultBranch)
 		headBranch = util.PathEscapeSegments(repo.Owner.Name) + "/" + util.PathEscapeSegments(repo.Name) + ":" + headBranch
 		repo = repo.BaseRepo
+	} else {
+		return false
 	}
 	ctx.Redirect(repo.Link() + "/compare/" + baseBranch + "..." + headBranch)
 	return true
@@ -172,7 +173,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
 	ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()
 	ctx.Data["commit_summary"] = ""
 	ctx.Data["commit_message"] = ""
-	if canCommit {
+	if canCommit && !canCreateBasePullRequest(ctx) {
 		ctx.Data["commit_choice"] = frmCommitChoiceDirect
 	} else {
 		ctx.Data["commit_choice"] = frmCommitChoiceNewBranch
@@ -421,7 +422,7 @@ func DeleteFile(ctx *context.Context) {
 	ctx.Data["commit_summary"] = ""
 	ctx.Data["commit_message"] = ""
 	ctx.Data["last_commit"] = ctx.Repo.CommitID
-	if canCommit {
+	if canCommit && !canCreateBasePullRequest(ctx) {
 		ctx.Data["commit_choice"] = frmCommitChoiceDirect
 	} else {
 		ctx.Data["commit_choice"] = frmCommitChoiceNewBranch
@@ -581,7 +582,7 @@ func UploadFile(ctx *context.Context) {
 	ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()
 	ctx.Data["commit_summary"] = ""
 	ctx.Data["commit_message"] = ""
-	if canCommit {
+	if canCommit && !canCreateBasePullRequest(ctx) {
 		ctx.Data["commit_choice"] = frmCommitChoiceDirect
 	} else {
 		ctx.Data["commit_choice"] = frmCommitChoiceNewBranch

templates/repo/editor/commit_form.tmpl

@@ -21,6 +21,7 @@
 			</div>
 		</div>
 		<div class="quick-pull-choice js-quick-pull-choice">
+			{{if not .IsForkDefaultBranch}}
 			<div class="field">
 				<div class="ui radio checkbox {{if not .CanCommitToBranch.CanCommitToBranch}}disabled{{end}}">
 					<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" button_text="{{.locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "direct"}}checked{{end}}>
@@ -39,6 +40,7 @@
 					</label>
 				</div>
 			</div>
+			{{end}}
 			{{if not .Repository.IsEmpty}}
 			<div class="field">
 				<div class="ui radio checkbox">