From 72bbe977d375127285152d92c951247ef546722f Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Fri, 16 Aug 2019 12:14:39 +0800 Subject: [PATCH] fix image head no field tenant --- pkg/image/models/images.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkg/image/models/images.go b/pkg/image/models/images.go index 8738e2395a..e03ae3839a 100644 --- a/pkg/image/models/images.go +++ b/pkg/image/models/images.go @@ -284,13 +284,17 @@ func (self *SImage) GetExtraDetailsHeaders(ctx context.Context, userCred mcclien headers := make(map[string]string) extra, _ := self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query) - if extra != nil { - for _, k := range extra.SortedKeys() { - log.Infof("%s", k) - val, _ := extra.GetString(k) - if len(val) > 0 { - headers[fmt.Sprintf("%s%s", modules.IMAGE_META, k)] = val - } + if extra == nil { + extra = jsonutils.NewDict() + } + extraRows := self.GetModelManager().FetchCustomizeColumns(ctx, userCred, query, []db.IModel{self}, nil) + if len(extraRows) == 1 { + extra.Update(extraRows[0]) + } + for _, k := range extra.SortedKeys() { + val, _ := extra.GetString(k) + if len(val) > 0 { + headers[fmt.Sprintf("%s%s", modules.IMAGE_META, k)] = val } }