Automatic merge from release/2.3.0 -> release/2.4.0

* commit '641a637e37d8fefdfaabd27b628397807f38b2ff':
  usage: fix schedtag usage panic
This commit is contained in:
邱剑
2018-11-16 20:36:00 +08:00
+1 -1
View File
@@ -37,7 +37,7 @@ func AttachUsageQuery(
case "vcenter":
q = q.Filter(sqlchemy.Equals(hosts.Field("manager_id"), rangeObjId))
case "schedtag":
aggHosts := SchedtagManager.Query().SubQuery()
aggHosts := HostschedtagManager.Query().SubQuery()
q = q.Join(aggHosts, sqlchemy.AND(
sqlchemy.Equals(hosts.Field("id"), aggHosts.Field("host_id")),
sqlchemy.IsFalse(aggHosts.Field("deleted")))).