Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-19 21:32:24 +01:00
Code Issues Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Wenkai Yin 2017-06-14 20:35:51 +08:00
parent 802a2fbcce
commit 421e9b114e
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/dao/project.go
View File

@ -275,7 +275,11 @@ func projectQueryConditions(owner, name string, public *bool, member string,
// 3. public projects and projects which the user is a member of // 3. public projects and projects which the user is a member of
collection := `project ` collection := `project `
if len(base) != 0 && base[0] != nil { if len(base) != 0 && base[0] != nil {
if len(base[0].Member) > 0 { if len(base[0].Member) == 0 && base[0].Public {
collection = `(select * from project pr
where pr.public=1) `
}
if len(base[0].Member) > 0 && base[0].Public {
collection = `(select pr.project_id, pr.owner_id, pr.name, pr. collection = `(select pr.project_id, pr.owner_id, pr.name, pr.
creation_time, pr.update_time, pr.deleted, pr.public creation_time, pr.update_time, pr.deleted, pr.public
from project pr from project pr
@ -283,15 +287,8 @@ func projectQueryConditions(owner, name string, public *bool, member string,
on pr.project_id = prm.project_id on pr.project_id = prm.project_id
join user ur join user ur
on prm.user_id=ur.user_id on prm.user_id=ur.user_id
where ur.username=? ` where ur.username=? or pr.public=1 )`
if base[0].Public {
collection += ` or pr.public=1 `
}
collection += `) `
params = append(params, base[0].Member) params = append(params, base[0].Member)
} else if base[0].Public {
collection = `(select * from project pr
where pr.public=1) `
} }
} }