From 2ff04e3d9793b18cbdc906e047cbdfd7aeccfaf9 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 12 Sep 2018 05:25:18 +0000 Subject: [PATCH] cloudcommon: virtualresource: optimize list with --field specified No functional change --- pkg/cloudcommon/db/db_dispatcher.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/cloudcommon/db/db_dispatcher.go b/pkg/cloudcommon/db/db_dispatcher.go index 0ee5ae6c20..924a785782 100644 --- a/pkg/cloudcommon/db/db_dispatcher.go +++ b/pkg/cloudcommon/db/db_dispatcher.go @@ -314,10 +314,11 @@ func query2List(manager IModelManager, ctx context.Context, userCred mcclient.To if err != nil { return nil, err } - fieldFilter := jsonutils.GetQueryStringArray(query, "field") listF := listFields(manager, userCred) - if len(fieldFilter) > 0 && userCred.IsSystemAdmin() { // only sysadmin can extend list Fields - listF = append(listF, fieldFilter...) + fieldFilter := jsonutils.GetQueryStringArray(query, "field") + if len(fieldFilter) > 0 && userCred.IsSystemAdmin() { + // only sysadmin can specify list Fields + listF = fieldFilter } showDetails := false showDetailsJson, _ := query.Get("details") @@ -356,9 +357,6 @@ func query2List(manager IModelManager, ctx context.Context, userCred mcclient.To } jsonDict = getModelExtraDetails(item, ctx, jsonDict) } - if len(fieldFilter) > 0 { - jsonDict = jsonDict.CopyIncludes(fieldFilter...) - } results = append(results, jsonDict) } return results, nil