Merge pull request #12573 from ioito/automated-cherry-pick-of-#12571-upstream-release-3.7

Automated cherry pick of #12571: fix(region): avoid panic when query is nil
This commit is contained in:
Zexi Li
2021-11-01 20:28:48 +08:00
committed by GitHub
+1 -1
View File
@@ -878,7 +878,7 @@ func getModelItemDetails(manager IModelManager, item IModel, ctx context.Context
}
func GetItemDetails(manager IModelManager, item IModel, ctx context.Context, userCred mcclient.TokenCredential) (jsonutils.JSONObject, error) {
return getItemDetails(manager, item, ctx, userCred, nil)
return getItemDetails(manager, item, ctx, userCred, jsonutils.NewDict())
}
func getItemDetails(manager IModelManager, item IModel, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {