From c9eac5b05c2f061c6cc259a2629ba819a7ce9378 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 24 Sep 2019 15:21:30 +0000
Subject: [PATCH] Completed Feature #17577 Commented code for Task #12480

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@181846 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                                     | 6 ++++--
 .../client/ui/form/CreateDatasetForm.ui.xml              | 2 +-
 .../server/CKANPublisherServicesImpl.java                | 3 +--
 .../server/threads/WritePostCatalogueManagerThread.java  | 9 +++++----
 .../server/utils/CatalogueRoleManager.java               | 1 +
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 69324f5..7607f8a 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -5,8 +5,10 @@
 		<Change>[Feature #11331] Field repeatability: support for catalogue
 			widget
 		</Change>
-		<Change>[Task #12480] Data Catalogue Publishing widget: filter the VREs for the working gateway
-			widget
+		<Change>[Task #12480] Data Catalogue Publishing widget: filter the
+			VREs for the working gateway widget
+		</Change>
+		<Change>[Feature #17577] Modify ckan-metadata-publisher-widget posts to cite people with @username
 		</Change>
 	</Changeset>
 	<Changeset
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.ui.xml
index 3fbb238..cf4440a 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.ui.xml
@@ -21,7 +21,7 @@
 	}
 	
 	@external .form-horizontal .input-large;
-	.form-horizontal .input-large {
+	.form-horizontal .input-large .input-prepend {
 		width: 95%;
 	}
 	
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
index 893171c..48d0ed6 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
@@ -410,8 +410,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
 			return resource;
 
 		}else{
-
-
+			
 			ResourceBean resourceBean = new ResourceBean(
 					resource.getUrl(),
 					resource.getName(),
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/WritePostCatalogueManagerThread.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/WritePostCatalogueManagerThread.java
index 24a5518..518df61 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/WritePostCatalogueManagerThread.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/WritePostCatalogueManagerThread.java
@@ -2,13 +2,10 @@ package org.gcube.portlets.widgets.ckandatapublisherwidget.server.threads;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.util.Base64;
 import java.util.List;
 
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.portal.GCubePortalConstants;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.portal.databook.client.GCubeSocialNetworking;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.server.utils.GCoreEndPointReaderSocial;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.server.utils.GenericUtils;
 import org.json.simple.JSONObject;
@@ -94,12 +91,16 @@ public class WritePostCatalogueManagerThread extends Thread {
 			ScopeProvider.instance.set(scope);
 			SecurityTokenProvider.instance.set(token);
 
-			final String profilePageURL = GCubePortalConstants.PREFIX_GROUP_URL + extractOrgFriendlyURL(userCurrentUrl) + GCubePortalConstants.USER_PROFILE_FRIENDLY_URL;
+			//see Feature #17577
+			/*final String profilePageURL = GCubePortalConstants.PREFIX_GROUP_URL + extractOrgFriendlyURL(userCurrentUrl) + GCubePortalConstants.USER_PROFILE_FRIENDLY_URL;
 
 			userFullName = "<a class=\"link\" href=\"" + profilePageURL + "?"+
 					Base64.getEncoder().encodeToString(GCubeSocialNetworking.USER_PROFILE_OID.getBytes())+"="+
 					Base64.getEncoder().encodeToString(username.getBytes())+"\">"+userFullName+
 					"</a> ";
+			*/
+			
+			userFullName = "@"+username;
 
 			// write
 			writeProductPost(
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/CatalogueRoleManager.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/CatalogueRoleManager.java
index 5998085..bf218e8 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/CatalogueRoleManager.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/CatalogueRoleManager.java
@@ -61,6 +61,7 @@ public class CatalogueRoleManager {
 			logger.debug("Group id is " + currentGroupId + " and scope is " + currentScope + "and gateway is "+gatewayHostname);
 			
 			Set<GCubeGroup> groups;
+			//Updated by Francesco see Task #12480
 			if(gatewayHostname!=null && !gatewayHostname.isEmpty()) {
 				// retrieve the list of organizations for the current user filtered for gateway
 				groups = groupManager.listGroupsByUserAndSite(userid, gatewayHostname);