Browse Source

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

master
Lunny Xiao GitHub 8 years ago
parent
commit
608bbedee1
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      templates/repo/settings/branches.tmpl

+ 4
- 4
templates/repo/settings/branches.tmpl View File

@@ -14,7 +14,7 @@
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" name="action" value="default_branch"> <input type="hidden" name="action" value="default_branch">
<div class="item"> <div class="item">
{{.i18n.Tr "settings.default_branch_desc"}}
{{.i18n.Tr "repo.settings.default_branch_desc"}}
</div> </div>
{{if not .Repository.IsBare}} {{if not .Repository.IsBare}}
<div class="ui grid padded"> <div class="ui grid padded">
@@ -51,11 +51,11 @@
<div class="ui fluid dropdown selection visible" tabindex="0"> <div class="ui fluid dropdown selection visible" tabindex="0">
<select id="protectedBranch" name="branch" data-url="{{.Repository.Link}}/settings/branches?action=protected_branch"> <select id="protectedBranch" name="branch" data-url="{{.Repository.Link}}/settings/branches?action=protected_branch">
{{range .LeftBranches}} {{range .LeftBranches}}
<option value="">{{.i18n.Tr "settings.choose_branch"}}</option>
<option value="">{{$.i18n.Tr "repo.settings.choose_branch"}}</option>
<option value="{{.}}">{{.}}</option> <option value="{{.}}">{{.}}</option>
{{end}} {{end}}
</select><i class="dropdown icon"></i> </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;"> <div class="menu transition hidden" tabindex="-1" style="display: block !important;">
{{range .LeftBranches}} {{range .LeftBranches}}
<div class="item" data-value="{{.}}">{{.}}</div> <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> <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> </tr>
{{else}} {{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}} {{end}}
</tbody> </tbody>
</table> </table>


Loading…
Cancel
Save