opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

在名称不冲突的情况下，允许非owner用户使用name访问资源

Browse Source
This commit is contained in:
Qiu Jian
2019-01-05 17:47:30 +08:00
parent 8a2f0cb650
commit ceaa929cdd
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/fetch.go
+8 -2
View File
@@ -38,8 +38,11 @@ func FetchByName(manager IModelManager, userCred mcclient.IIdentityProvider, idS
}
q := manager.Query()
q = manager.FilterByName(q, idStr)
q = manager.FilterByOwner(q, owner)
count := q.Count()
if count > 1 {
q = manager.FilterByOwner(q, owner)
count = q.Count()
}
if count == 1 {
obj, err := NewModelObject(manager)
if err != nil {
@@ -105,8 +108,11 @@ func fetchItemByName(manager IModelManager, ctx context.Context, userCred mcclie
}
}
q = manager.FilterByName(q, idStr)
q = manager.FilterByOwner(q, manager.GetOwnerId(userCred))
count := q.Count()
if count > 1 {
q = manager.FilterByOwner(q, manager.GetOwnerId(userCred))
count = q.Count()
}
if count == 1 {
item, err := NewModelObject(manager)
if err != nil {