From 85a5ddb98047ac325aa04af9251bb640b7ea77bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 26 Feb 2018 10:38:09 +0000
Subject: [PATCH] =?UTF-8?q?N=C2=B0478=20-=20Customizable=20access=20to=20t?=
 =?UTF-8?q?he=20'Admin=20Tools'=20-=20Display=20additional=20rights=20(gra?=
 =?UTF-8?q?nt=5Fby=5Fprofile)=20in=20the=20grant=20matrix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SVN:trunk[5367]
---
 addons/userrights/userrightsprofile.class.inc.php | 7 ++-----
 core/userrights.class.inc.php                     | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php
index 386876c24..339298243 100644
--- a/addons/userrights/userrightsprofile.class.inc.php
+++ b/addons/userrights/userrightsprofile.class.inc.php
@@ -137,11 +137,8 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		$oUserRights = UserRights::GetModuleInstance();
 	
 		$aDisplayData = array();
-		foreach (MetaModel::GetClasses('bizmodel') as $sClass)
+		foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass)
 		{
-			// Skip non instantiable classes
-			if (MetaModel::IsAbstract($sClass)) continue;
-
 			$aStimuli = array();
 			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
 			{
@@ -183,7 +180,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		if (!$bEditMode)
 		{
 			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
-			$this->DoShowGrantSumary($oPage);		
+			$this->DoShowGrantSumary($oPage);
 		}
 	}
 
diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php
index c46bb898c..ad92e362a 100644
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -370,8 +370,8 @@ abstract class User extends cmdbAbstractObject
 		if (!$bEditMode)
 		{
 			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
-			$this->DoShowGrantSumary($oPage, 'bizmodel');
-	
+			$this->DoShowGrantSumary($oPage, 'bizmodel,grant_by_profile');
+
 			// debug
 			if (false)
 			{