Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ableneo/liferay/portal/setup/core/SetupPermissions.java

Author: bimki

pom.xml

@@ -8,7 +8,7 @@
         <version>9</version>
     </parent>
 
-    <version>7.4.3861-SNAPSHOT</version>
+    <version>7.4.3862-SNAPSHOT</version>
     <groupId>com.ableneo.liferay</groupId>
     <artifactId>com.ableneo.liferay.db.setup.core</artifactId>
     <description>Creates Liferay Portal data (permissions, roles, sites, pages etc.) from XML declaration.</description>

src/main/java/com/ableneo/liferay/portal/setup/core/SetupPermissions.java

@@ -11,10 +11,7 @@
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.model.Layout;
-import com.liferay.portal.kernel.model.Resource;
-import com.liferay.portal.kernel.model.ResourceConstants;
-import com.liferay.portal.kernel.model.ResourcePermission;
+import com.liferay.portal.kernel.model.*;
 import com.liferay.portal.kernel.model.role.RoleConstants;
 import com.liferay.portal.kernel.security.permission.ActionKeys;
 import com.liferay.portal.kernel.service.ResourceLocalServiceUtil;
@@ -49,26 +46,7 @@ public static void setupPortletPermissions(final ResourcePermissions resourcePer
                     final Set<String> actionStrings = actionsPerRoleEntry.getValue();
                     final String[] actionIds = actionStrings.toArray(new String[actionStrings.size()]);
 
-                    /**
-                     * Individual permission is needed even though we set
-                     */
-                    ResourcePermissionLocalServiceUtil.setResourcePermissions(
-                        companyId,
-                        resource.getResourceId(),
-                        ResourceConstants.SCOPE_INDIVIDUAL,
-                        String.valueOf(companyId),
-                        roleId,
-                        actionIds
-                    );
-                    ResourcePermissionLocalServiceUtil.setResourcePermissions(
-                        companyId,
-                        resource.getResourceId(),
-                        ResourceConstants.SCOPE_COMPANY,
-                        String.valueOf(companyId),
-                        roleId,
-                        actionIds
-                    );
-                    if (role.getType() == RoleConstants.TYPE_SITE) {
+                    if (role.getType() == RoleConstants.TYPE_SITE || role.getType() == RoleConstants.TYPE_ORGANIZATION) {
                         ResourcePermissionLocalServiceUtil.setResourcePermissions(
                             companyId,
                             resource.getResourceId(),
@@ -77,6 +55,26 @@ public static void setupPortletPermissions(final ResourcePermissions resourcePer
                             roleId,
                             actionIds
                         );
+                    } else {
+                        /**
+                         * Individual permission is needed even though we set
+                         */
+                        ResourcePermissionLocalServiceUtil.setResourcePermissions(
+                            companyId,
+                            resource.getResourceId(),
+                            ResourceConstants.SCOPE_INDIVIDUAL,
+                            String.valueOf(companyId),
+                            roleId,
+                            actionIds
+                        );
+                        ResourcePermissionLocalServiceUtil.setResourcePermissions(
+                            companyId,
+                            resource.getResourceId(),
+                            ResourceConstants.SCOPE_COMPANY,
+                            String.valueOf(companyId),
+                            roleId,
+                            actionIds
+                        );
                     }
                     LOG.info(String.format("Set permission for role: %1$s for action ids: %2$s", roleName, actionIds));
                 } catch (NestableException e) {