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

Merge pull request #1151 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-private-sku-query-fix to release/2.7.0

Browse Source 
* commit '7324572cb9052cbe4f143c5b8fee6ba657b87036':
  private sku query fix
This commit is contained in:
张东亮
2019-03-04 15:21:23 +08:00
parent a549cf6512 7324572cb9
commit d5b20cbfaf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/skus.go
+3 -3
View File
@@ -590,9 +590,7 @@ func (manager *SServerSkuManager) ListItemFilter(ctx context.Context, q *sqlchem
}
regionTable := CloudregionManager.Query().SubQuery()
zoneTable := ZoneManager.Query().SubQuery()
q = q.Join(regionTable, sqlchemy.Equals(regionTable.Field("id"), q.Field("cloudregion_id")))
q = q.Join(zoneTable, sqlchemy.Equals(zoneTable.Field("id"), q.Field("zone_id")))
// region filter
regionStr := jsonutils.GetAnyString(query, []string{"region", "cloudregion", "region_id", "cloudregion_id"})
@@ -609,7 +607,9 @@ func (manager *SServerSkuManager) ListItemFilter(ctx context.Context, q *sqlchem
zoneStr := jsonutils.GetAnyString(query, []string{"zone", "zone_id"})
var zoneObj db.IModel
if len(zoneStr) > 0 {
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 {