Allow set branch protection in an empty repository (#32095) (#32119)

Backport #32095 by @lunny

Resolve #32093

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

diff --git a/routers/web/web.go b/routers/web/web.go
index 62613663fdcdcf30a654ea3a641feedd6441de79..328be992d41189d22d2b79bed5ee6037f7dbd05b 100644 (file)
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1063,7 +1063,7 @@ func registerRoutes(m *web.Route) {
                        m.Combo("/edit").Get(repo_setting.SettingsProtectedBranch).
                                Post(web.Bind(forms.ProtectBranchForm{}), context.RepoMustNotBeArchived(), repo_setting.SettingsProtectedBranchPost)
                        m.Post("/{id}/delete", repo_setting.DeleteProtectedBranchRulePost)
-               }, repo.MustBeNotEmpty)
+               })
 
                m.Group("/tags", func() {
                        m.Get("", repo_setting.ProtectedTags)

diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 52c0c2c800b688d76951d65913d91c43fb2db8e6..6f070ba61cd0f32aa2c4bf29d1511a0507c5effe 100644 (file)
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -15,19 +15,17 @@
                                <form class="tw-flex" action="{{.Link}}" method="post">
                                        {{.CsrfTokenHtml}}
                                        <input type="hidden" name="action" value="default_branch">
-                                       {{if not .Repository.IsEmpty}}
-                                               <div class="ui dropdown selection search tw-flex-1 tw-mr-2 tw-max-w-96">
-                                                       {{svg "octicon-triangle-down" 14 "dropdown icon"}}
-                                                       <input type="hidden" name="branch" value="{{.Repository.DefaultBranch}}">
-                                                       <div class="default text">{{.Repository.DefaultBranch}}</div>
-                                                       <div class="menu">
-                                                               {{range .Branches}}
-                                                                       <div class="item" data-value="{{.}}">{{.}}</div>
-                                                               {{end}}
-                                                       </div>
+                                       <div class="ui dropdown selection search tw-flex-1 tw-mr-2 tw-max-w-96">
+                                               {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+                                               <input type="hidden" name="branch" value="{{.Repository.DefaultBranch}}">
+                                               <div class="default text">{{.Repository.DefaultBranch}}</div>
+                                               <div class="menu">
+                                                       {{range .Branches}}
+                                                               <div class="item" data-value="{{.}}">{{.}}</div>
+                                                       {{end}}
                                                </div>
-                                               <button class="ui primary button">{{ctx.Locale.Tr "repo.settings.branches.update_default_branch"}}</button>
-                                       {{end}}
+                                       </div>
+                                       <button class="ui primary button"{{if .Repository.IsEmpty}} disabled{{end}}>{{ctx.Locale.Tr "repo.settings.branches.update_default_branch"}}</button>
                                </form>
                        </div>
 

diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index 414effbf2f3bd208935b6420948bb9bae6933dfe..debfad20b79ab20f7d6db85746d87bdd238887ca 100644 (file)
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -13,11 +13,9 @@
                        </a>
                {{end}}
                {{if .Repository.UnitEnabled $.Context ctx.Consts.RepoUnitTypeCode}}
-                       {{if not .Repository.IsEmpty}}
-                               <a class="{{if .PageIsSettingsBranches}}active {{end}}item" href="{{.RepoLink}}/settings/branches">
-                                       {{ctx.Locale.Tr "repo.settings.branches"}}
-                               </a>
-                       {{end}}
+                       <a class="{{if .PageIsSettingsBranches}}active {{end}}item" href="{{.RepoLink}}/settings/branches">
+                               {{ctx.Locale.Tr "repo.settings.branches"}}
+                       </a>
                        <a class="{{if .PageIsSettingsTags}}active {{end}}item" href="{{.RepoLink}}/settings/tags">
                                {{ctx.Locale.Tr "repo.settings.tags"}}
                        </a>