Automatic merge from release/2.1.0 -> release/2.2.0

* commit '3ad1342f4ddd79eb3f71ff372150f5b72913b336':
  delete project bugfix
This commit is contained in:
唐斌
2018-12-11 19:48:40 +08:00
+1
View File
@@ -241,6 +241,7 @@ func (this *ProjectManagerV3) Delete(session *mcclient.ClientSession, id string,
func (this *ProjectManagerV3) DeleteInContexts(session *mcclient.ClientSession, id string, body jsonutils.JSONObject, ctxs []ManagerContext) (jsonutils.JSONObject, error) {
if ctxs == nil {
p := jsonutils.NewDict()
p.Add(jsonutils.JSONTrue, "admin")
p.Add(jsonutils.NewString(id), "tenant")
ret, e := Servers.List(session, p)
if e != nil {