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

统一 details -> isList

Browse Source
This commit is contained in:
Qu Xuan
2020-02-07 17:54:48 +08:00
parent 1d8990f7fa
commit 366cbd4e36
82 changed files with 166 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/caller.go
+2 -2
View File
@@ -172,8 +172,8 @@ func ListItemFilter(manager IModelManager, ctx context.Context, q *sqlchemy.SQue
return ret[0].Interface().(*sqlchemy.SQuery), nil
}
func GetExtraDetails(model IModel, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (*jsonutils.JSONDict, error) {
ret, err := call(model, "GetExtraDetails", ctx, userCred, query, details)
func GetExtraDetails(model IModel, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (*jsonutils.JSONDict, error) {
ret, err := call(model, "GetExtraDetails", ctx, userCred, query, isList)
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
pkg/cloudcommon/db/db_dispatcher.go
+2 -2
View File
@@ -376,7 +376,7 @@ func Query2List(manager IModelManager, ctx context.Context, userCred mcclient.To
jsonDict = jsonDict.CopyIncludes([]string(listF)...)
jsonDict.Update(extraData)
if showDetails && !query.Contains("export_keys") {
extraDict, _ := GetExtraDetails(item, ctx, userCred, query, false)
extraDict, _ := GetExtraDetails(item, ctx, userCred, query, true)
if extraDict != nil {
// Fix for Now
extraDict.Update(jsonDict)
@@ -753,7 +753,7 @@ func getModelItemDetails(manager IModelManager, item IModel, ctx context.Context
}
func getItemDetails(manager IModelManager, item IModel, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {
extraDict, err := GetExtraDetails(item, ctx, userCred, query, true)
extraDict, err := GetExtraDetails(item, ctx, userCred, query, false)
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
pkg/cloudcommon/db/modelbase.go
+1 -1
View File
@@ -456,7 +456,7 @@ func (model *SModelBase) AllowGetDetails(ctx context.Context, userCred mcclient.
return false
}
func (model *SModelBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (apis.ModelBaseDetails, error) {
func (model *SModelBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (apis.ModelBaseDetails, error) {
return getModelExtraDetails(model.GetIModel(), ctx), nil
}
pkg/cloudcommon/db/sharablevirtual.go
+2 -2
View File
@@ -277,10 +277,10 @@ func (model *SSharableVirtualResourceBase) getMoreDetails(ctx context.Context, u
return out
}
func (model *SSharableVirtualResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (apis.SharableVirtualResourceDetails, error) {
func (model *SSharableVirtualResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (apis.SharableVirtualResourceDetails, error) {
var err error
out := apis.SharableVirtualResourceDetails{}
out.VirtualResourceDetails, err = model.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = model.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/cloudcommon/db/standalone.go
+2 -2
View File
@@ -239,10 +239,10 @@ func (model *SStandaloneResourceBase) GetShortDescV2(ctx context.Context) *apis.
return desc
}
func (model *SStandaloneResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (apis.StandaloneResourceDetails, error) {
func (model *SStandaloneResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (apis.StandaloneResourceDetails, error) {
var err error
out := apis.StandaloneResourceDetails{}
out.ModelBaseDetails, err = model.SResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = model.SResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/cloudcommon/db/virtualresource.go
+2 -2
View File
@@ -296,10 +296,10 @@ func (model *SVirtualResourceBase) GetTenantCache(ctx context.Context) (*STenant
return TenantCacheManager.FetchTenantById(ctx, model.ProjectId)
}
func (model *SVirtualResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (apis.VirtualResourceDetails, error) {
func (model *SVirtualResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (apis.VirtualResourceDetails, error) {
var err error
out := apis.VirtualResourceDetails{}
out.StandaloneResourceDetails, err = model.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = model.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}