Merge pull request #1402 from wqweto/develop

Allow file and directory names to contain percent character
release/v1.15
无闻 2015-07-28 17:46:58 +08:00
commit 678700b74d
3 changed files with 4 additions and 4 deletions

View File

@ -178,7 +178,7 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
"Oauth2Name": Oauth2Name,
"ToUtf8": ToUtf8,
"EscapePound": func(str string) string {
return strings.Replace(str, "#", "%23", -1)
return strings.Replace(strings.Replace(str, "%", "%25", -1), "#", "%23", -1)
},
"RenderCommitMessage": RenderCommitMessage,
}

View File

@ -48,7 +48,7 @@
{{ $l := Subtract $n 1}}
{{range $i, $v := .Treenames}}
{{if eq $i $l}}
<span class="bread">{{EscapePound $v}}</span>
<span class="bread">{{$v}}</span>
{{else}}
<span class="bread"><a href="{{EscapePound $.BranchLink}}/{{index $.Paths $i}}">{{$v}}</a></span>
{{end}}

View File

@ -50,7 +50,7 @@
<span class="octicon octicon-file-{{if or $entry.IsDir}}directory{{else}}text{{end}}"></span>
</td>
<td class="name">
<a href="{{EscapePound $.BranchLink}}/{{$.TreePath}}{{$entry.Name}}" class="text-truncate">{{$entry.Name}}</a>
<a href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreePath}}{{EscapePound $entry.Name}}" class="text-truncate">{{$entry.Name}}</a>
</td>
{{end}}
<td class="sha">
@ -66,4 +66,4 @@
</table>
{{if .ReadmeExist}}
{{template "repo/view_file" .}}
{{end}}
{{end}}