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 #11153 from ioito/automated-cherry-pick-of-#11152-upstream-release-3.7

Browse Source 
Automated cherry pick of #11152: fix(region): avoid index out of range panic
This commit is contained in:
Zexi Li
2021-05-19 17:40:10 +08:00
committed by GitHub
parent 5a49a3b0b1 11a2f89f6c
commit af88fea62e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/project_mappings.go
+5 -5
View File
@@ -209,17 +209,17 @@ func (manager *SProjectMappingManager) FetchCustomizeColumns(
for i := range rows {
mp := objs[i].(*SProjectMapping)
rows[i].Accounts, _ = accountMapping[mpIds[i]]
if mp.Rules != nil {
rows[i].Rules = []api.ProjectMappingRuleInfoDetails{}
rows[i].Accounts, _ = accountMapping[mpIds[i]]
for i := range *mp.Rules {
for j := range *mp.Rules {
rules := *mp.Rules
rule := api.ProjectMappingRuleInfoDetails{
ProjectMappingRuleInfo: rules[i],
ProjectMappingRuleInfo: rules[j],
}
rule.Tenant, _ = projectMaps[rules[i].ProjectId]
rule.Tenant, _ = projectMaps[rules[j].ProjectId]
rule.Project = rule.Tenant
rule.Domain, _ = domainMaps[rules[i].DomainId]
rule.Domain, _ = domainMaps[rules[j].DomainId]
rows[i].Rules = append(rows[i].Rules, rule)
}
}