Commit e668f259 authored by Yann Mombrun's avatar Yann Mombrun
Browse files

Merge branch 'develop'

parents 68a24bb3 9802a4b5
......@@ -7,8 +7,8 @@ This portlet can also be instantiated in order to create user for the applicatio
The super administrator also has the ability (when instantiated) to recreate the application pages by clicking on a button.
# Build status (testing purposes)
[![build status](https://gitlab.ow2.org/weblab/application-installer-portlet/badges/master/build.svg)](https://gitlab.ow2.org/weblab/application-installer-portlet/commits/master)
# Build status
[![build status](https://gitlab.ow2.org/weblab/portlets/application-installer-portlet/badges/master/build.svg)](https://gitlab.ow2.org/weblab/portlets/application-installer-portlet/commits/master)
# How to build it
......
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>parent</artifactId>
<version>1.2.8.1</version>
<relativePath />
</parent>
<artifactId>weblab-application-installer-portlet</artifactId>
<version>2.1.1</version>
<packaging>war</packaging>
<name>WebLab Application Installer Portlet</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-service</artifactId>
<version>6.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.3.0.Final</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
</dependency>
</dependencies>
<scm>
<connection>scm:git:git@gitlab.ow2.org:weblab/application-installer-portlet.git</connection>
<developerConnection>scm:git:git@gitlab.ow2.org:weblab/application-installer-portlet.git</developerConnection>
<tag>weblab-application-installer-portlet-2.1.1</tag>
</scm>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>true</filtering>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.3</version>
<configuration>
<providerImplementations>
<git>jgit</git>
</providerImplementations>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-jgit</artifactId>
<version>1.9.5</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>parent</artifactId>
<version>1.2.8.1</version>
<relativePath />
</parent>
<artifactId>weblab-application-installer-portlet</artifactId>
<version>2.1.2</version>
<packaging>war</packaging>
<name>WebLab Application Installer Portlet</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-service</artifactId>
<version>6.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.3.0.Final</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
</dependency>
</dependencies>
<scm>
<connection>scm:git:git@gitlab.ow2.org:weblab/application-installer-portlet.git</connection>
<developerConnection>scm:git:git@gitlab.ow2.org:weblab/application-installer-portlet.git</developerConnection>
<tag>HEAD</tag>
</scm>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>true</filtering>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.3</version>
<configuration>
<providerImplementations>
<git>jgit</git>
</providerImplementations>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-jgit</artifactId>
<version>1.9.5</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
......@@ -462,7 +462,7 @@ public class ApplicationService extends PortalService {
fetchedRole = RoleLocalServiceUtil.addRole(defaultUserId, null, 0, role.getName(), null, null, RoleConstants.TYPE_REGULAR, null, null);
}
if ((role.getName().equalsIgnoreCase(Roles.WEBLAB_ADMINISTRATOR) && fetchedRole != null) || this.forceUserAndRoleReinstall) {
if (fetchedRole != null && (role.getName().equalsIgnoreCase(Roles.WEBLAB_ADMINISTRATOR) || this.forceUserAndRoleReinstall)) {
// organization roles
ResourcePermissionLocalServiceUtil.setResourcePermissions(companyId, Organization.class.getName(), ResourceConstants.SCOPE_GROUP_TEMPLATE,
String.valueOf(GroupConstants.DEFAULT_PARENT_GROUP_ID), fetchedRole.getRoleId(), new String[] { ActionKeys.ASSIGN_MEMBERS, ActionKeys.MANAGE_USERS, ActionKeys.VIEW });
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment