opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-28 03:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4924 from tb365/bugfix/tb-bugfix-011601

Browse Source 
server sku filter by city bugfix
This commit is contained in:
yunion-ci-robot
2020-01-17 08:46:07 +08:00
committed by GitHub
parent 4aee13b813 9956a04e22
commit 0fa2e68627
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/skus.go
+5 -6
View File
@@ -776,7 +776,6 @@ func (manager *SServerSkuManager) ListItemFilter(ctx context.Context, q *sqlchem
}
zoneStr := query.Zone
regionStr := query.Cloudregion
if len(zoneStr) > 0 {
_zone, err := ZoneManager.FetchByIdOrName(userCred, zoneStr)
if err != nil {
@@ -796,11 +795,11 @@ func (manager *SServerSkuManager) ListItemFilter(ctx context.Context, q *sqlchem
} else {
q = q.Equals("zone_id", zone.Id)
}
} else if len(regionStr) > 0 {
q, err = managedResourceFilterByRegion(q, query.RegionalFilterListInput, "", nil)
if err != nil {
return nil, errors.Wrap(err, "managedResourceFilterByRegion")
}
}
q, err = managedResourceFilterByRegion(q, query.RegionalFilterListInput, "", nil)
if err != nil {
return nil, errors.Wrap(err, "managedResourceFilterByRegion")
}
// 按区间查询内存, 避免0.75G这样的套餐不好过滤