opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

virtual resource details rename domain to project_domain

Browse Source
This commit is contained in:
Zexi
2019-06-13 16:06:28 +08:00
parent 77164e1050
commit 2a00f59122
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/virtualresource.go
+3 -3
View File
@@ -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")