From 9cc15d18dfe25f5e0a7569ffb6203e9a4dbb2404 Mon Sep 17 00:00:00 2001
From: John Olheiser <john.olheiser@gmail.com>
Date: Mon, 23 Jan 2023 15:51:18 -0600
Subject: [PATCH] Project links should use parent link methods (#22587)
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>
---
models/project/project.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/models/project/project.go b/models/project/project.go
index 8bac9115ba9..273823ac9d3 100644
--- a/models/project/project.go
+++ b/models/project/project.go
@@ -123,7 +123,7 @@ func (p *Project) Link() string {
log.Error("LoadOwner: %v", err)
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 {
err := p.LoadRepo(db.DefaultContext)
@@ -131,7 +131,7 @@ func (p *Project) Link() string {
log.Error("LoadRepo: %v", err)
return ""
}
- return fmt.Sprintf("/%s/projects/%d", p.Repo.RepoPath(), p.ID)
+ return fmt.Sprintf("%s/projects/%d", p.Repo.Link(), p.ID)
}
return ""
}