opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10804 from ioito/hotfix/qx-mt-ag-policy

Browse Source 
fix: owner id fix
This commit is contained in:
Zexi Li
2021-04-19 21:05:23 +08:00
committed by GitHub
parent fd7bf98aab 1f2099ac01
commit f56c585072
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/access_group_caches.go
+9 -1
View File
@@ -166,10 +166,18 @@ func (manager *SAccessGroupCacheManager) QueryDistinctExtraField(q *sqlchemy.SQu
return q, httperrors.ErrNotFound
}
func (self *SAccessGroupCache) GetOwnerId() mcclient.IIdentityProvider {
ag, err := self.GetAccessGroup()
if err != nil {
return &db.SOwnerId{}
}
return &db.SOwnerId{DomainId: ag.DomainId}
}
func (manager *SAccessGroupCacheManager) FilterByOwner(q *sqlchemy.SQuery, userCred mcclient.IIdentityProvider, scope rbacutils.TRbacScope) *sqlchemy.SQuery {
if userCred != nil {
sq := AccessGroupManager.Query("id")
if len(userCred.GetProjectDomainId()) > 0 {
if scope == rbacutils.ScopeDomain && len(userCred.GetProjectDomainId()) > 0 {
sq = sq.Equals("domain_id", userCred.GetProjectDomainId())
return q.In("access_group_id", sq)
}
pkg/compute/models/mount_targets.go
+9 -1
View File
@@ -272,10 +272,18 @@ func (manager *SMountTargetManager) QueryDistinctExtraField(q *sqlchemy.SQuery,
return q, httperrors.ErrNotFound
}
func (self *SMountTarget) GetOwnerId() mcclient.IIdentityProvider {
fs, err := self.GetFileSystem()
if err != nil {
return &db.SOwnerId{}
}
return &db.SOwnerId{DomainId: fs.DomainId}
}
func (manager *SMountTargetManager) FilterByOwner(q *sqlchemy.SQuery, userCred mcclient.IIdentityProvider, scope rbacutils.TRbacScope) *sqlchemy.SQuery {
if userCred != nil {
sq := FileSystemManager.Query("id")
if len(userCred.GetProjectDomainId()) > 0 {
if scope == rbacutils.ScopeDomain && len(userCred.GetProjectDomainId()) > 0 {
sq = sq.Equals("domain_id", userCred.GetProjectDomainId())
return q.In("file_system_id", sq)
}