finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Project links should use parent link methods (#22587)

Browse source 
Instead of re-creating, these should use the available `Link` methods
from the "parent" of the project, which also take sub-urls into account.

Signed-off-by: jolheiser <john.olheiser@gmail.com>
This commit is contained in:
John Olheiser 2023-01-23 15:51:18 -06:00 committed by GitHub
parent 519b91ad2d
commit 9cc15d18df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
models/project/project.go
View file

@ -123,7 +123,7 @@ func (p *Project) Link() string {
log.Error("LoadOwner: %v", err) log.Error("LoadOwner: %v", err)
return "" return ""
} }
return fmt.Sprintf("/%s/-/projects/%d", p.Owner.Name, p.ID) return fmt.Sprintf("%s/-/projects/%d", p.Owner.HomeLink(), p.ID)
} }
if p.RepoID > 0 { if p.RepoID > 0 {
err := p.LoadRepo(db.DefaultContext) err := p.LoadRepo(db.DefaultContext)
@ -131,7 +131,7 @@ func (p *Project) Link() string {
log.Error("LoadRepo: %v", err) log.Error("LoadRepo: %v", err)
return "" return ""
} }
return fmt.Sprintf("/%s/projects/%d", p.Repo.RepoPath(), p.ID) return fmt.Sprintf("%s/projects/%d", p.Repo.Link(), p.ID)
} }
return "" return ""
} }