From c3eea2f8af599c94e49e687a80e91a14144b5ea6 Mon Sep 17 00:00:00 2001 From: qwerty287 <80460567+qwerty287@users.noreply.github.com> Date: Mon, 13 Dec 2021 02:59:09 +0100 Subject: Improve behavior of "Fork" button (#17288) * Improbe behaviour of fork button * Apply suggestions from code review * Remove old lines * Apply suggestions * Fix test * Remove unnecessary or * Update templates/repo/header.tmpl Co-authored-by: silverwind * Add comment * Fix situation if you can't fork but don't have forks * Fix lint * Apply changes from #17783 * fmt * fmt * Apply tweaks Co-authored by: silverwind * Rm dupl css * Fix build Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: silverwind Co-authored-by: wxiaoguang Co-authored-by: Lunny Xiao --- models/repo.go | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'models') diff --git a/models/repo.go b/models/repo.go index 397b4380d6..897ceeede9 100644 --- a/models/repo.go +++ b/models/repo.go @@ -294,6 +294,36 @@ func CanUserForkRepo(user *user_model.User, repo *repo_model.Repository) (bool, return false, nil } +// GetForksByUserAndOrgs return forked repos of the user and owned orgs +func GetForksByUserAndOrgs(user *user_model.User, repo *repo_model.Repository) ([]*repo_model.Repository, error) { + var repoList []*repo_model.Repository + if user == nil { + return repoList, nil + } + var forkedRepo *repo_model.Repository + forkedRepo, err := repo_model.GetUserFork(repo.ID, user.ID) + if err != nil { + return repoList, err + } + if forkedRepo != nil { + repoList = append(repoList, forkedRepo) + } + canCreateRepos, err := GetOrgsCanCreateRepoByUserID(user.ID) + if err != nil { + return repoList, err + } + for _, org := range canCreateRepos { + forkedRepo, err := repo_model.GetUserFork(repo.ID, org.ID) + if err != nil { + return repoList, err + } + if forkedRepo != nil { + repoList = append(repoList, forkedRepo) + } + } + return repoList, nil +} + // CanUserDelete returns true if user could delete the repository func CanUserDelete(repo *repo_model.Repository, user *user_model.User) (bool, error) { if user.IsAdmin || user.ID == repo.OwnerID { -- cgit v1.2.3