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 #4221 from rainzm/bugfix/snapshotpolicy_list

Browse Source 
fix(region): Fix the bug of snapshotpolicy's list with details
This commit is contained in:
yunion-ci-robot
2019-12-19 11:10:04 +08:00
committed by GitHub
parent d9ae4ddad0 f90f95ba35
commit 127147be5b
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)