opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6143 from swordqiu/hotfix/qj-list-lbbg-panic

Browse Source 
fix: list lbbg panic
This commit is contained in:
Zexi Li
2020-04-30 10:35:00 +08:00
committed by GitHub
parent 7a1f1ec922 34aacdcde7
commit d494c331c2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalancerclusterresource.go
+2 -2
View File
@@ -234,7 +234,7 @@ func (manager *SLoadbalancerClusterResourceBaseManager) ListItemExportKeys(ctx c
) (*sqlchemy.SQuery, error) {
if keys.ContainsAny(manager.GetExportKeys()...) {
var err error
subq := LoadbalancerClusterManager.Query("id", "name", "wire_d", "zone_id").SubQuery()
subq := LoadbalancerClusterManager.Query("id", "name", "wire_id", "zone_id").SubQuery()
q = q.LeftJoin(subq, sqlchemy.Equals(q.Field("cluster_id"), subq.Field("id")))
if keys.Contains("cluster") {
@@ -247,7 +247,7 @@ func (manager *SLoadbalancerClusterResourceBaseManager) ListItemExportKeys(ctx c
}
}
if keys.Contains("wire") {
q, err = manager.SWireResourceBaseManager.ListItemExportKeys(ctx, q, userCred, keys)
q, err = manager.SWireResourceBaseManager.ListItemExportKeys(ctx, q, userCred, stringutils2.NewSortedStrings([]string{"wire"}))
if err != nil {
return nil, errors.Wrap(err, "SWireResourceBaseManager.ListItemExportKeys")
}