opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 23:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #429 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-delete-fail to release/2.3.0

Browse Source 
* commit '7208814421e5a1714beb11ee51c377cdff436f66':
  修正：policy删除报错找不到blob
This commit is contained in:
邱剑
2018-11-05 18:43:47 +08:00
parent 24509e485f 7208814421
commit 223a126793
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/modules/mod_policies.go
+7 -8
View File
@@ -14,15 +14,14 @@ var Policies SPolicyManager
func policyReadFilter(session *mcclient.ClientSession, s jsonutils.JSONObject) (jsonutils.JSONObject, error) {
ss := s.(*jsonutils.JSONDict)
ret := ss.CopyIncludes("id", "type")
blobStr, err := ss.GetString("blob")
if err != nil {
return nil, err
blobStr, _ := ss.GetString("blob")
if len(blobStr) > 0 {
blobJson, err := jsonutils.ParseString(blobStr)
if err != nil {
return nil, err
}
ret.Add(jsonutils.NewString(blobJson.YAMLString()), "policy")
}
blobJson, err := jsonutils.ParseString(blobStr)
if err != nil {
return nil, err
}
ret.Add(jsonutils.NewString(blobJson.YAMLString()), "policy")
return ret, nil
}