diff --git a/pkg/cloudcommon/db/virtualresource.go b/pkg/cloudcommon/db/virtualresource.go index 0aa76e768d..21a5f05618 100644 --- a/pkg/cloudcommon/db/virtualresource.go +++ b/pkg/cloudcommon/db/virtualresource.go @@ -187,7 +187,7 @@ func (manager *SVirtualResourceBaseManager) AllowCreateItem(ctx context.Context, func (manager *SVirtualResourceBaseManager) FetchCustomizeColumns(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, objs []IModel, fields stringutils2.SSortedStrings) []*jsonutils.JSONDict { rows := manager.SStandaloneResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields) - if len(fields) == 0 || fields.Contains("tenant") || fields.Contains("domain") { + if len(fields) == 0 || fields.Contains("tenant") || fields.Contains("project_domain") { projectIds := stringutils2.SSortedStrings{} for i := range objs { idStr := objs[i].GetOwnerId().GetProjectId() @@ -198,8 +198,8 @@ func (manager *SVirtualResourceBaseManager) FetchCustomizeColumns(ctx context.Co for i := range rows { idStr := objs[i].GetOwnerId().GetProjectId() if proj, ok := projects[idStr]; ok { - if len(fields) == 0 || fields.Contains("domain") { - rows[i].Add(jsonutils.NewString(proj.Domain), "domain") + if len(fields) == 0 || fields.Contains("project_domain") { + rows[i].Add(jsonutils.NewString(proj.Domain), "project_domain") } if len(fields) == 0 || fields.Contains("tenant") { rows[i].Add(jsonutils.NewString(proj.Name), "tenant") diff --git a/pkg/keystone/models/identitybase.go b/pkg/keystone/models/identitybase.go index 06c50811e2..a84e73887f 100644 --- a/pkg/keystone/models/identitybase.go +++ b/pkg/keystone/models/identitybase.go @@ -153,7 +153,7 @@ func (manager *SIdentityBaseResourceManager) NamespaceScope() rbacutils.TRbacSco func (manager *SIdentityBaseResourceManager) FetchCustomizeColumns(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, objs []db.IModel, fields stringutils2.SSortedStrings) []*jsonutils.JSONDict { rows := manager.SStandaloneResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields) - if len(fields) == 0 || fields.Contains("domain") { + if len(fields) == 0 || fields.Contains("project_domain") { domainIds := stringutils2.SSortedStrings{} for i := range objs { idStr := objs[i].GetOwnerId().GetProjectDomainId() @@ -167,8 +167,8 @@ func (manager *SIdentityBaseResourceManager) FetchCustomizeColumns(ctx context.C idStr := objs[i].GetOwnerId().GetProjectDomainId() if idStr != api.KeystoneDomainRoot { if domain, ok := domains[idStr]; ok { - if len(fields) == 0 || fields.Contains("domain") { - rows[i].Add(jsonutils.NewString(domain.Name), "domain") + if len(fields) == 0 || fields.Contains("project_domain") { + rows[i].Add(jsonutils.NewString(domain.Name), "project_domain") } } }