From 56ad85ae2ad88f1e5e93cc81363b44d08363c8d8 Mon Sep 17 00:00:00 2001 From: Benjamin Kroeger Date: Mon, 16 Jan 2017 15:23:33 +0100 Subject: [PATCH] Role model: resolves related models by name Resolve models related to the `Role` model by name instead of class. --- common/models/role.js | 6 +++--- test/role.test.js | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/common/models/role.js b/common/models/role.js index e7e93c51..a09f7563 100644 --- a/common/models/role.js +++ b/common/models/role.js @@ -36,9 +36,9 @@ module.exports = function(Role) { Role.resolveRelatedModels = function() { if (!this.userModel) { var reg = this.registry; - this.roleMappingModel = reg.getModelByType(loopback.RoleMapping); - this.userModel = reg.getModelByType(loopback.User); - this.applicationModel = reg.getModelByType(loopback.Application); + this.roleMappingModel = reg.getModelByType('RoleMapping'); + this.userModel = reg.getModelByType('User'); + this.applicationModel = reg.getModelByType('Application'); } }; diff --git a/test/role.test.js b/test/role.test.js index aeb9f5cd..2e987595 100644 --- a/test/role.test.js +++ b/test/role.test.js @@ -45,9 +45,6 @@ describe('role model', function() { ACL.roleMappingModel = RoleMapping; ACL.userModel = User; ACL.applicationModel = Application; - Role.roleMappingModel = RoleMapping; - Role.userModel = User; - Role.applicationModel = Application; }); it('should define role/role relations', function(done) {