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

fix(region): Fix the bug of snapshotpolicy's list with details

Browse Source 
snapshotpolicy的GetCustomizeColumns和GetExtraDetails本来写的就有问题，
不过在2.12版本没有展示出来，因为2.13版本参数结构化的原因，details获取
的时候extraDict和jsonDict的更新逻辑有所改变，使得query携带着list第一
个item的数据一直存在整个循环之中，最终数据都是一样的。
This commit is contained in:
Rain
2019-12-18 21:12:52 +08:00
parent 5bdbaa7da3
commit f90f95ba35
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/snapshotpolicy.go
+9 -6
View File
@@ -307,21 +307,24 @@ func (sp *SSnapshotPolicy) StartSnapshotPolicyDeleteTask(ctx context.Context, us
func (sp *SSnapshotPolicy) GetCustomizeColumns(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject) *jsonutils.JSONDict {
ret, _ := sp.getMoreDetails(ctx, userCred, query)
extraDict := sp.SVirtualResourceBase.GetCustomizeColumns(ctx, userCred, query)
ret, _ := sp.getMoreDetails(ctx, userCred, extraDict)
return ret
}
func (sp *SSnapshotPolicy) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject) (*jsonutils.JSONDict, error) {
return sp.getMoreDetails(ctx, userCred, query)
extraDict, err := sp.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query)
if err != nil {
return nil, err
}
return sp.getMoreDetails(ctx, userCred, extraDict)
}
func (sp *SSnapshotPolicy) getMoreDetails(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject) (*jsonutils.JSONDict, error) {
extraDict *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
ret := query.(*jsonutils.JSONDict)
ret := extraDict
// more
weekdays := SnapshotPolicyManager.RepeatWeekdaysToIntArray(sp.RepeatWeekdays)
timePoints := SnapshotPolicyManager.TimePointsToIntArray(sp.TimePoints)