From f39dad5f3031d70ad51d50da60fe8638a158ec3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kujawa?= Date: Wed, 15 Dec 2021 13:47:41 +0100 Subject: [PATCH 1/4] Fixes error 500 that appears when trying to browse code of a repository generated from template --- models/repo/repo.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/models/repo/repo.go b/models/repo/repo.go index e5943b5a2d36c..a06a7001fc43f 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -683,6 +683,16 @@ func getTemplateRepo(e db.Engine, repo *Repository) (*Repository, error) { return getRepositoryByID(e, repo.TemplateID) } +// TemplateRepo returns the repository link +func (repo *Repository) TemplateRepo() *Repository { + repos, err := GetTemplateRepo(repo) + if err != nil { + log.Error("TemplateRepo: %v", err) + return nil + } + return repos +} + func countRepositories(userID int64, private bool) int64 { sess := db.GetEngine(db.DefaultContext).Where("id > 0") From 4b178afa878447e8d674931c5f8e2d195aefe28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kujawa?= Date: Wed, 15 Dec 2021 13:52:16 +0100 Subject: [PATCH 2/4] forgot to update comment --- models/repo/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index a06a7001fc43f..6f347358699ac 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -683,7 +683,7 @@ func getTemplateRepo(e db.Engine, repo *Repository) (*Repository, error) { return getRepositoryByID(e, repo.TemplateID) } -// TemplateRepo returns the repository link +// TemplateRepo returns the repository, which is template of this repository func (repo *Repository) TemplateRepo() *Repository { repos, err := GetTemplateRepo(repo) if err != nil { From f79779f2bf2209231ba425ea007b37d9258cd5a8 Mon Sep 17 00:00:00 2001 From: Caellion Date: Wed, 15 Dec 2021 17:43:51 +0100 Subject: [PATCH 3/4] Update models/repo/repo.go Co-authored-by: Lunny Xiao --- models/repo/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index 6f347358699ac..fd7c2bac64dad 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -685,7 +685,7 @@ func getTemplateRepo(e db.Engine, repo *Repository) (*Repository, error) { // TemplateRepo returns the repository, which is template of this repository func (repo *Repository) TemplateRepo() *Repository { - repos, err := GetTemplateRepo(repo) + repo, err := GetTemplateRepo(repo) if err != nil { log.Error("TemplateRepo: %v", err) return nil From 63d8e33ef0f377f3b1456c3c323d7c8812935bb6 Mon Sep 17 00:00:00 2001 From: Caellion Date: Wed, 15 Dec 2021 17:49:23 +0100 Subject: [PATCH 4/4] Update repo.go --- models/repo/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index fd7c2bac64dad..43ac9fb62afd7 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -690,7 +690,7 @@ func (repo *Repository) TemplateRepo() *Repository { log.Error("TemplateRepo: %v", err) return nil } - return repos + return repo } func countRepositories(userID int64, private bool) int64 {