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

.tern-project

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

pom.xml

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

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

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

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

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