Merge branch '1.x' into 2.0

This commit is contained in:
Raymond Feng 2014-07-16 11:06:24 -07:00
commit 4e1d8c9a4e
1 changed files with 2 additions and 2 deletions

View File

@ -142,7 +142,7 @@ app.model = function (Model, config) {
isPublic = config.public !== false;
} else {
assert(Model.prototype instanceof registry.Model,
'Model must be a descendant of loopback.Model');
Model.modelName + ' must be a descendant of loopback.Model');
}
var modelName = Model.modelName;
@ -411,7 +411,7 @@ function dataSourcesFromConfig(config, connectorRegistry) {
function configureModel(ModelCtor, config, app) {
assert(ModelCtor.prototype instanceof registry.Model,
'Model must be a descendant of loopback.Model');
ModelCtor.modelName + ' must be a descendant of loopback.Model');
var dataSource = config.dataSource;