mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-21 06:09:39 +08:00
fix: 修复secgrouprule-list 500错误
This commit is contained in:
@@ -103,7 +103,7 @@ func (manager *SSecurityGroupResourceBaseManager) ListItemFilter(
|
||||
return nil, errors.Wrap(err, "SecurityGroupManager.FetchByIdOrName")
|
||||
}
|
||||
}
|
||||
q = q.Equals("secgroup", secgrpObj.GetId())
|
||||
q = q.Equals("secgroup_id", secgrpObj.GetId())
|
||||
}
|
||||
return q, nil
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@ import (
|
||||
"yunion.io/x/onecloud/pkg/mcclient"
|
||||
"yunion.io/x/onecloud/pkg/util/logclient"
|
||||
"yunion.io/x/onecloud/pkg/util/rbacutils"
|
||||
"yunion.io/x/onecloud/pkg/util/stringutils2"
|
||||
)
|
||||
|
||||
type SSecurityGroupRuleManager struct {
|
||||
@@ -195,6 +196,35 @@ func (manager *SSecurityGroupRuleManager) ListItemFilter(
|
||||
return sql, nil
|
||||
}
|
||||
|
||||
func (self *SSecurityGroupRule) GetExtraDetails(
|
||||
ctx context.Context,
|
||||
userCred mcclient.TokenCredential,
|
||||
query jsonutils.JSONObject,
|
||||
isList bool,
|
||||
) (api.SecgroupRuleDetails, error) {
|
||||
return api.SecgroupRuleDetails{}, nil
|
||||
}
|
||||
|
||||
func (manager *SSecurityGroupRuleManager) FetchCustomizeColumns(
|
||||
ctx context.Context,
|
||||
userCred mcclient.TokenCredential,
|
||||
query jsonutils.JSONObject,
|
||||
objs []interface{},
|
||||
fields stringutils2.SSortedStrings,
|
||||
isList bool,
|
||||
) []api.SecgroupRuleDetails {
|
||||
rows := make([]api.SecgroupRuleDetails, len(objs))
|
||||
bRows := manager.SResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
|
||||
secRows := manager.SSecurityGroupResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
|
||||
for i := range rows {
|
||||
rows[i] = api.SecgroupRuleDetails{
|
||||
ResourceBaseDetails: bRows[i],
|
||||
SecurityGroupResourceInfo: secRows[i],
|
||||
}
|
||||
}
|
||||
return rows
|
||||
}
|
||||
|
||||
func (manager *SSecurityGroupRuleManager) OrderByExtraFields(
|
||||
ctx context.Context,
|
||||
q *sqlchemy.SQuery,
|
||||
|
||||
Reference in New Issue
Block a user