feature: 3-level policies, system/domain/project

This commit is contained in:
Qiu Jian
2019-05-24 02:19:32 +08:00
parent b8e6598ac6
commit 966d43aa20
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -126,7 +126,7 @@ func (manager *SDomainManager) FetchDomainById(domainId string) (*SDomain, error
if err != nil {
return nil, err
}
q := manager.Query().Equals("id", domainId).NotEquals("id", api.KeystoneDomainRoot)
q := manager.Query().Equals("id", domainId) // .NotEquals("id", api.KeystoneDomainRoot)
err = q.First(obj)
if err != nil {
return nil, err
+1
View File
@@ -79,6 +79,7 @@ func policyWriteFilter(session *mcclient.ClientSession, s jsonutils.JSONObject,
return nil, err
}
}
// ret.Add(jsonutils.NewString(blobJson.String()), "blob")
ret.Add(blobJson, "blob")
}
if s.Contains("type") {