Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix 500 caused by branches settings introduced by #1198 (#1214)

Browse Source
This commit is contained in:
Lunny Xiao 2017-03-12 21:50:26 +08:00 committed by GitHub
parent 0475e7351f
commit 608bbedee1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/repo/settings/branches.tmpl
View File

@ -14,7 +14,7 @@
{{.CsrfTokenHtml}}
<input type="hidden" name="action" value="default_branch">
<div class="item">
{{.i18n.Tr "settings.default_branch_desc"}}
{{.i18n.Tr "repo.settings.default_branch_desc"}}
</div>
{{if not .Repository.IsBare}}
<div class="ui grid padded">
@ -51,11 +51,11 @@
<div class="ui fluid dropdown selection visible" tabindex="0">
<select id="protectedBranch" name="branch" data-url="{{.Repository.Link}}/settings/branches?action=protected_branch">
{{range .LeftBranches}}
<option value="">{{.i18n.Tr "settings.choose_branch"}}</option>
<option value="">{{$.i18n.Tr "repo.settings.choose_branch"}}</option>
<option value="{{.}}">{{.}}</option>
{{end}}
</select><i class="dropdown icon"></i>
<div class="default text">{{.i18n.Tr "settings.choose_branch"}}</div>
<div class="default text">{{.i18n.Tr "repo.settings.choose_branch"}}</div>
<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
{{range .LeftBranches}}
<div class="item" data-value="{{.}}">{{.}}</div>
@ -75,7 +75,7 @@
<td class="right aligned"><button class="rm ui red button" data-url="{{$.Repository.Link}}/settings/branches?action=protected_branch&id={{.ID}}" data-val="{{.BranchName}}">Delete</button></td>
</tr>
{{else}}
<tr class="center aligned"><td>{{.i18n.Tr "settings.no_protected_branch"}}</td></tr>
<tr class="center aligned"><td>{{.i18n.Tr "repo.settings.no_protected_branch"}}</td></tr>
{{end}}
</tbody>
</table>