Automatic merge from release/2.0.0 -> release/2.1.0

* commit 'e0f42e6e3c3216602403476704e8304c48169a2f':
This commit is contained in:
邱剑
2018-08-11 22:25:57 +08:00
+3
View File
@@ -840,6 +840,9 @@ func (dispatcher *DBModelDispatcher) PerformClassAction(ctx context.Context, act
defer lockman.ReleaseClass(ctx, dispatcher.modelManager, ownerProjId)
managerValue := reflect.ValueOf(dispatcher.modelManager)
if action == "check-create-data" {
return dispatcher.modelManager.ValidateCreateData(ctx, userCred, ownerProjId, query, data.(*jsonutils.JSONDict))
}
return objectPerformAction(dispatcher, managerValue, ctx, userCred, action, query, data)
}