opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

private sku query bugfix

Browse Source
This commit is contained in:
TangBin
2019-03-04 15:38:44 +08:00
parent 7324572cb9
commit cf76eccdd7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/skus.go
+5 -2
View File
@@ -605,11 +605,14 @@ func (manager *SServerSkuManager) ListItemFilter(ctx context.Context, q *sqlchem
q = q.Equals("cloudregion_id", regionObj.GetId())
}
if public_cloud || len(provider) > 0 {
zoneTable := ZoneManager.Query().SubQuery()
q = q.Join(zoneTable, sqlchemy.Equals(zoneTable.Field("id"), q.Field("zone_id")))
}
zoneStr := jsonutils.GetAnyString(query, []string{"zone", "zone_id"})
var zoneObj db.IModel
if (public_cloud || len(provider) > 0) && len(zoneStr) > 0 {
zoneTable := ZoneManager.Query().SubQuery()
q = q.Join(zoneTable, sqlchemy.Equals(zoneTable.Field("id"), q.Field("zone_id")))
zoneObj, err = ZoneManager.FetchByIdOrName(nil, zoneStr)
if err != nil {
if err == sql.ErrNoRows {