gCubeSystem
/
join-vre
14
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for Task #6289 

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/join-vre@141442 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2017-01-02 14:07:13 +00:00
parent e911cf8c0e
commit c97361dfb7
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.tern-project
View File

@ -1 +1,17 @@
{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]} {
"plugins": {
"aui": {
},
"liferay": {
},
"yui": {
}
},
"libs": [
"ecma5",
"browser"
]
}

7
pom.xml
View File

@ -78,7 +78,7 @@
<dependency> <dependency>
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
<artifactId>invites-common-library</artifactId> <artifactId>invites-common-library</artifactId>
<version>[1.0.0-SNAPSHOT,)</version> <version>[1.3.0-SNAPSHOT,)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
@ -88,7 +88,7 @@
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-scope-maps</artifactId> <artifactId>common-scope-maps</artifactId>
<scope>compile</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.dvos</groupId> <groupId>org.gcube.dvos</groupId>
@ -112,15 +112,18 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8</version> <version>4.8</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

8
src/main/java/org/gcube/portlets/user/joinvre/client/ui/VreThumbnail.java
View File

@ -53,10 +53,6 @@ public class VreThumbnail extends Composite {
joinButton.setType(ButtonType.WARNING); joinButton.setType(ButtonType.WARNING);
joinButton.setEnabled(false); joinButton.setEnabled(false);
} }
if (vre.getUserBelonging() == UserBelonging.BELONGING) {
joinButton.setType(ButtonType.SUCCESS);
joinButton.setText("Access Granted");
}
break; break;
case OPEN: case OPEN:
joinButton.setText("Enter this VRE"); joinButton.setText("Enter this VRE");
@ -66,6 +62,10 @@ public class VreThumbnail extends Composite {
joinButton.setText("Private"); joinButton.setText("Private");
break; break;
} }
if (vre.getUserBelonging() == UserBelonging.BELONGING) {
joinButton.setType(ButtonType.SUCCESS);
joinButton.setText("Enter this VRE");
}
vreImage.setUrl(vre.getImageURL()); vreImage.setUrl(vre.getImageURL());
} }

2
src/main/webapp/WEB-INF/liferay-plugin-package.properties
View File

@ -1,6 +1,6 @@
name=joinvre name=joinvre
module-group-id=liferay module-group-id=liferay
module-incremental-version=1 module-incremental-version=2
tags= tags=
short-description= short-description=
change-log= change-log=