Automatic merge from release/2.6.0 -> master

* commit 'bd71944432825cf0c3a8a8b08de45ad8f23cd6ca':
  避免前端更改描述字段后刷新没有相关字段
This commit is contained in:
邱剑
2019-01-15 17:04:08 +08:00
+2
View File
@@ -92,6 +92,8 @@ func (self *SSecurityGroup) GetExtraDetails(ctx context.Context, userCred mcclie
}
extra.Add(jsonutils.NewInt(int64(len(self.GetGuests()))), "guest_cnt")
extra.Add(jsonutils.NewString(self.getSecurityRuleString("")), "rules")
extra.Add(jsonutils.NewString(self.getSecurityRuleString("in")), "in_rules")
extra.Add(jsonutils.NewString(self.getSecurityRuleString("out")), "out_rules")
return extra, nil
}