verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3135 from strongloop/backport/fix-role-models-resolution 

Role model: resolve related models by name
This commit is contained in:
Miroslav Bajtoš 2017-01-25 16:23:48 +01:00 committed by GitHub
parent b2a00286a3 56ad85ae2a
commit 97f96f4ab8
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/models/role.js
View File

@ -36,9 +36,9 @@ module.exports = function(Role) {
Role.resolveRelatedModels = function() { Role.resolveRelatedModels = function() {
if (!this.userModel) { if (!this.userModel) {
var reg = this.registry; var reg = this.registry;
this.roleMappingModel = reg.getModelByType(loopback.RoleMapping); this.roleMappingModel = reg.getModelByType('RoleMapping');
this.userModel = reg.getModelByType(loopback.User); this.userModel = reg.getModelByType('User');
this.applicationModel = reg.getModelByType(loopback.Application); this.applicationModel = reg.getModelByType('Application');
} }
}; };

3
test/role.test.js
View File

@ -45,9 +45,6 @@ describe('role model', function() {
ACL.roleMappingModel = RoleMapping; ACL.roleMappingModel = RoleMapping;
ACL.userModel = User; ACL.userModel = User;
ACL.applicationModel = Application; ACL.applicationModel = Application;
Role.roleMappingModel = RoleMapping;
Role.userModel = User;
Role.applicationModel = Application;
}); });
it('should define role/role relations', function(done) { it('should define role/role relations', function(done) {