summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2023-02-10 00:31:30 +0800
committerGitHub <noreply@github.com>2023-02-09 11:31:30 -0500
commit24a9caa2f33db2664510e79f184892c8cb266b62 (patch)
tree8be9d1541d92606f85ee72111752dad5dc3fea03 /models
parent0c190e396df7025683b56f0e6f64356c907a8512 (diff)
downloadgitea-24a9caa2f33db2664510e79f184892c8cb266b62.tar.gz
gitea-24a9caa2f33db2664510e79f184892c8cb266b62.zip
Fix more HTMLURL in templates (#22831)
I haven't tested `runs_list.tmpl` but I think it could be right. After this PR, besides the `<meta .. HTMLURL>` in html head, the only explicit HTMLURL usage is in `pull_merge_instruction.tmpl`, which doesn't affect users too much and it's difficult to fix at the moment. There are still many usages of `AppUrl` in the templates (eg: the package help manual), they are similar problems as the HTMLURL in pull_merge_instruction, and they might be fixed together in the future. Diff without space: https://github.com/go-gitea/gitea/pull/22831/files?diff=unified&w=1
Diffstat (limited to 'models')
-rw-r--r--models/issues/issue_xref.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/models/issues/issue_xref.go b/models/issues/issue_xref.go
index 21ee24210f..a1086f9e81 100644
--- a/models/issues/issue_xref.go
+++ b/models/issues/issue_xref.go
@@ -277,26 +277,26 @@ func CommentTypeIsRef(t CommentType) bool {
return t == CommentTypeCommentRef || t == CommentTypePullRef || t == CommentTypeIssueRef
}
-// RefCommentHTMLURL returns the HTML URL for the comment that created this reference
-func (c *Comment) RefCommentHTMLURL() string {
+// RefCommentLink returns the relative URL for the comment that created this reference
+func (c *Comment) RefCommentLink() string {
// Edge case for when the reference is inside the title or the description of the referring issue
if c.RefCommentID == 0 {
- return c.RefIssueHTMLURL()
+ return c.RefIssueLink()
}
if err := c.LoadRefComment(); err != nil { // Silently dropping errors :unamused:
log.Error("LoadRefComment(%d): %v", c.RefCommentID, err)
return ""
}
- return c.RefComment.HTMLURL()
+ return c.RefComment.Link()
}
-// RefIssueHTMLURL returns the HTML URL of the issue where this reference was created
-func (c *Comment) RefIssueHTMLURL() string {
+// RefIssueLink returns the relative URL of the issue where this reference was created
+func (c *Comment) RefIssueLink() string {
if err := c.LoadRefIssue(); err != nil { // Silently dropping errors :unamused:
log.Error("LoadRefIssue(%d): %v", c.RefCommentID, err)
return ""
}
- return c.RefIssue.HTMLURL()
+ return c.RefIssue.Link()
}
// RefIssueTitle returns the title of the issue where this reference was created