Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix TemplateRepo no longer in models.repo #17993

Merged
merged 5 commits into from
Dec 16, 2021
Merged

Fix TemplateRepo no longer in models.repo #17993

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f39dad5
Fixes error 500 that appears when trying to browse code of a reposito…
Caellion Dec 15, 2021
4b178af
forgot to update comment
Caellion Dec 15, 2021
f79779f
Update models/repo/repo.go
Caellion Dec 15, 2021
63d8e33
Update repo.go
Caellion Dec 15, 2021
be11a53
Merge branch 'main' into fix-templaterepo
lunny Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions models/repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,16 @@ func getTemplateRepo(e db.Engine, repo *Repository) (*Repository, error) {
return getRepositoryByID(e, repo.TemplateID)
}

// TemplateRepo returns the repository, which is template of this repository
func (repo *Repository) TemplateRepo() *Repository {
repos, err := GetTemplateRepo(repo)
Caellion marked this conversation as resolved.
Show resolved Hide resolved
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")

Expand Down