From b63015ad9f0f9c9060a98df254d4c5e899f7f734 Mon Sep 17 00:00:00 2001 From: Jurigag Date: Fri, 23 Oct 2015 17:26:07 +0200 Subject: [PATCH] Allowing getResourceId to be string --- dist/acl.js | 6 ++++++ src/acl-service.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dist/acl.js b/dist/acl.js index c029b72..058451f 100644 --- a/dist/acl.js +++ b/dist/acl.js @@ -347,6 +347,9 @@ angular.module('ng-acl').service('AclService', ["AclRegistryService", function ( if (resource instanceof Object && typeof resource.getResourceId === 'function') { resource = resource.getResourceId(); } + else if (resource instanceof Object && typeof resource.getResourceId === 'string'){ + resource = resource.getResourceId; + } return _resources[resource].id; }; @@ -370,6 +373,9 @@ angular.module('ng-acl').service('AclService', ["AclRegistryService", function ( if (resource instanceof Object && typeof resource.getResourceId === 'function') { resource = resource.getResourceId(); } + else if (resource instanceof Object && typeof resource.getResourceId === 'string'){ + resource = resource.getResourceId; + } return _resources[resource] !== undefined; }; diff --git a/src/acl-service.js b/src/acl-service.js index fb7ae43..467c8c8 100644 --- a/src/acl-service.js +++ b/src/acl-service.js @@ -346,6 +346,9 @@ angular.module('ng-acl').service('AclService', function (AclRegistryService) { if (resource instanceof Object && typeof resource.getResourceId === 'function') { resource = resource.getResourceId(); } + else if (resource instanceof Object && typeof resource.getResourceId === 'string'){ + resource = resource.getResourceId; + } return _resources[resource].id; }; @@ -369,6 +372,9 @@ angular.module('ng-acl').service('AclService', function (AclRegistryService) { if (resource instanceof Object && typeof resource.getResourceId === 'function') { resource = resource.getResourceId(); } + else if (resource instanceof Object && typeof resource.getResourceId === 'string'){ + resource = resource.getResourceId; + } return _resources[resource] !== undefined; };