diff options
| author | Alec S <linuxbash8@gmail.com> | 2016-03-09 22:56:52 -0600 |
|---|---|---|
| committer | Alec S <linuxbash8@gmail.com> | 2016-03-09 22:56:52 -0600 |
| commit | af847ef94e02dd120246fa1e8d7f7ab999f0cc90 (patch) | |
| tree | 82f85bc5c3a7b8fee5b6cdf1f37336c10e73aa24 /models | |
| parent | bfed3ea7d3e0ea07fefa90e60514994beae0cb75 (diff) | |
| parent | b44e4d7cb08bb88e2f206101a162662ead29836a (diff) | |
Merge branch 'develop' of github.com:gogits/gogs into develop
Diffstat (limited to 'models')
| -rw-r--r-- | models/org.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/models/org.go b/models/org.go index 1fee4f52..c2665902 100644 --- a/models/org.go +++ b/models/org.go @@ -1071,11 +1071,10 @@ WHERE team_user.org_id = ? AND team_user.uid = ?`, org.Id, userID).Find(&teams); } repos := make([]*Repository, 0, 5) - if err = x.Sql(`SELECT repository.* FROM repository + if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository INNER JOIN team_repo ON team_repo.repo_id = repository.id -WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (?) -GROUP BY repository.id`, - org.Id, false, strings.Join(teamIDs, ",")).Find(&repos); err != nil { +WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s) +GROUP BY repository.id`, strings.Join(teamIDs, ",")), org.Id, false).Find(&repos); err != nil { return fmt.Errorf("get repositories: %v", err) } org.Repos = repos |