chandrasegar
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix for visible role issue' (#190) from prathabanKavin/device-mgt-core:visiblerolefix into master

Browse Source 
Reviewed-on: community/device-mgt-core#190
revert
Pahansith Gunathilake 1 year ago
parent 1921b3e54d 20906122db
commit a8badb22c4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File

7
components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/RoleManagementServiceImpl.java
Unescape View File

@ -126,8 +126,11 @@ public class RoleManagementServiceImpl implements RoleManagementService {
List<String> visibleRoles; List<String> visibleRoles;
RoleList visibleRoleList = new RoleList(); RoleList visibleRoleList = new RoleList();
try { try {
metadata = DeviceMgtAPIUtils.getMetadataManagementService().retrieveMetadata(metaKey); String metaValue = "{\"isUserAbleToViewAllRoles\":false}";
String metaValue = metadata.getMetaValue(); if(DeviceMgtAPIUtils.getMetadataManagementService().retrieveMetadata(metaKey) != null){
metadata = DeviceMgtAPIUtils.getMetadataManagementService().retrieveMetadata(metaKey);
metaValue = metadata.getMetaValue();
}
JSONParser parser = new JSONParser(); JSONParser parser = new JSONParser();
JSONObject jsonObject = (JSONObject) parser.parse(metaValue); JSONObject jsonObject = (JSONObject) parser.parse(metaValue);
boolean decision = (boolean) jsonObject.get(Constants.IS_USER_ABLE_TO_VIEW_ALL_ROLES); boolean decision = (boolean) jsonObject.get(Constants.IS_USER_ABLE_TO_VIEW_ALL_ROLES);

Write Preview
Loading…
Cancel
Save