Remove branch URL before IssueRefURL #15968

2021-05-24T15:37:46Z

fnetX commented

2021-05-24 15:37:46 +00:00

(Migrated from github.com)

My attempt to fix #15967 (duplicate Owner/Branch in URL when linking to a branch from an issue).
It appears to me as if IssueRefURLs already contain the full valid URL by now and thus prepending the Owner and Branch leads to duplication.

My attempt to fix #15967 (duplicate Owner/Branch in URL when linking to a branch from an issue). It appears to me as if `IssueRefURLs` already contain the full valid URL by now and thus prepending the Owner and Branch leads to duplication.

noerw (Migrated from github.com) requested changes 2021-05-24 16:04:53 +00:00

noerw (Migrated from github.com) left a comment

Thanks! One nit, see code comment.
Ffor reference; the repoLink is prepended to the URLs here already
cc7e1b84a7/services/issue/issue.go (L167)

Thanks! One nit, see code comment. Ffor reference; the `repoLink` is prepended to the URLs here already https://github.com/go-gitea/gitea/blob/cc7e1b84a7d32497e12e020e0fb0fe8649da04de/services/issue/issue.go#L167

templates/shared/issuelist.tmpl

noerw (Migrated from github.com) commented

2021-05-24 16:04:08 +00:00

Both cases have the same result; simplify as

						<a class="ref" href="{{index $.IssueRefURLs .ID}}">

Both cases have the same result; simplify as ```suggestion <a class="ref" href="{{index $.IssueRefURLs .ID}}"> ```

fnetX (Migrated from github.com) reviewed 2021-05-24 16:19:15 +00:00

templates/shared/issuelist.tmpl

fnetX (Migrated from github.com) commented

2021-05-24 16:19:15 +00:00

Sure, didn't have a close look since this logic appeared unrelated to my PR 😂

Sure, didn't have a close look since this logic appeared unrelated to my PR :joy:

noerw (Migrated from github.com) reviewed 2021-05-24 17:12:23 +00:00

templates/shared/issuelist.tmpl

noerw (Migrated from github.com) commented

2021-05-24 17:12:23 +00:00

 						<a class="ref" {{if $.RepoLink}}href="{{index $.IssueRefURLs .ID}}"{{else}}href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{index $.IssueRefURLs .ID}}"{{end}}>

```suggestion <a class="ref" {{if $.RepoLink}}href="{{index $.IssueRefURLs .ID}}"{{else}}href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{index $.IssueRefURLs .ID}}"{{end}}> ```

fnetX (Migrated from github.com) reviewed 2021-05-24 17:41:24 +00:00

templates/shared/issuelist.tmpl

fnetX (Migrated from github.com) commented

2021-05-24 17:41:24 +00:00

Just to confirm this a last time: .RepoLink holds the information whether {index $.IssueRefURLs .ID}} holds the full URL or not? That makes sense then.

Just to confirm this a last time: `.RepoLink` holds the information whether `{index $.IssueRefURLs .ID}}` holds the full URL or not? That makes sense then.

noerw (Migrated from github.com) reviewed 2021-05-24 17:49:00 +00:00

templates/shared/issuelist.tmpl

noerw (Migrated from github.com) commented

2021-05-24 17:49:00 +00:00

Right, that's my understanding from a couple of tests (it actually holds absolute URL to the repo, but this is only set on the <owner>/<repo>/issues page)

Right, that's my understanding from a couple of tests (it actually holds absolute URL to the repo, but this is only set on the `<owner>/<repo>/issues` page)