stonewareslord/gogs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #1965 - the hyperlink and the display name of the branch

Browse Source 
The hyperlink and the display name of the branch if the branch is in a folder or the branch name has '#'
This commit is contained in:
Arthur Ouyang 2015-11-19 07:31:55 +08:00
parent f04d773f4f
commit e04c97b9fa
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/locale/locale_en-US.ini
View File

@ -966,7 +966,7 @@ notices.delete_success = System notice has been deleted successfully.
[action] [action]
create_repo = created repository <a href="%s">%s</a> create_repo = created repository <a href="%s">%s</a>
rename_repo = renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a> rename_repo = renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a>
commit_repo = pushed to <a href="%s/src/%s">%[2]s</a> at <a href="%[1]s">%[3]s</a> commit_repo = pushed to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
create_issue = `opened issue <a href="%s/issues/%s">%s#%[2]s</a>` create_issue = `opened issue <a href="%s/issues/%s">%s#%[2]s</a>`
create_pull_request = `created pull request <a href="%s/pulls/%s">%s#%[2]s</a>` create_pull_request = `created pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
comment_issue = `commented on issue <a href="%s/issues/%s">%s#%[2]s</a>` comment_issue = `commented on issue <a href="%s/issues/%s">%s#%[2]s</a>`

4
modules/git/utils.go
View File

@ -35,6 +35,10 @@ func parsePrettyFormatLog(repo *Repository, logByts []byte) (*list.List, error)
} }
func RefEndName(refStr string) string { func RefEndName(refStr string) string {
if strings.HasPrefix(refStr, "refs/heads/") {
return strings.TrimPrefix(refStr, "refs/heads/")
}
index := strings.LastIndex(refStr, "/") index := strings.LastIndex(refStr, "/")
if index != -1 { if index != -1 {
return refStr[index+1:] return refStr[index+1:]

3
templates/user/dashboard/feeds.tmpl
View File

@ -13,7 +13,8 @@
{{else if eq .GetOpType 2}} {{else if eq .GetOpType 2}}
{{$.i18n.Tr "action.rename_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}} {{$.i18n.Tr "action.rename_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}}
{{else if eq .GetOpType 5}} {{else if eq .GetOpType 5}}
{{$.i18n.Tr "action.commit_repo" .GetRepoLink .GetBranch .GetRepoPath | Str2html}} {{ $branchLink := .GetBranch | EscapePound}}
{{$.i18n.Tr "action.commit_repo" .GetRepoLink $branchLink .GetBranch .GetRepoPath | Str2html}}
{{else if eq .GetOpType 6}} {{else if eq .GetOpType 6}}
{{ $index := index .GetIssueInfos 0}} {{ $index := index .GetIssueInfos 0}}
{{$.i18n.Tr "action.create_issue" .GetRepoLink $index .GetRepoPath | Str2html}} {{$.i18n.Tr "action.create_issue" .GetRepoLink $index .GetRepoPath | Str2html}}