Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java

@@ -135,7 +135,7 @@ public class RoleManagementServiceImpl implements RoleManagementService {
         final UserRealmProxy userRealmProxy = new UserRealmProxy(userRealmCore);
         final UIPermissionNode rolePermissions =
                 userRealmProxy.getRolePermissions(roleName, MultitenantConstants.SUPER_TENANT_ID);
-        UIPermissionNode[] deviceMgtPermissions = new UIPermissionNode[2];
+        UIPermissionNode[] deviceMgtPermissions = new UIPermissionNode[4];
 
         for (UIPermissionNode permissionNode : rolePermissions.getNodeList()) {
             if (permissionNode.getResourcePath().equals("/permission/admin")) {
@@ -144,6 +144,15 @@ public class RoleManagementServiceImpl implements RoleManagementService {
                         deviceMgtPermissions[0] = node;
                     } else if (node.getResourcePath().equals("/permission/admin/login")) {
                         deviceMgtPermissions[1] = node;
+                    } else if (node.getResourcePath().equals("/permission/admin/manage")) {
+                        // Adding permissions related to app-store in emm-console
+                        for (UIPermissionNode subNode : node.getNodeList()) {
+                            if (subNode.getResourcePath().equals("/permission/admin/manage/mobileapp")) {
+                                deviceMgtPermissions[2] = subNode;
+                            } else if (subNode.getResourcePath().equals("/permission/admin/manage/webapp")) {
+                                deviceMgtPermissions[3] = subNode;
+                            }
+                        }
                     }
                 }
             }

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/RequestValidationUtil.java

@@ -337,10 +337,10 @@ public class RequestValidationUtil {
                     new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request parameter limit is a " +
                             "negative value.").build());
         }
-        if (limit - offset > 100) {
+        if (limit > 100) {
             throw new InputValidationException(
-                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request results list should" +
-                            " be less than or equal 100 values.").build());
+                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request parameter limit should" +
+                            " be less than or equal to 100.").build());
         }
 
     }