From e3a7220a958b1e3b9ceacf512027cce28e883bb3 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 18 May 2017 10:58:56 +0000 Subject: [PATCH] Fix for bug #7630 git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/share-updates@148842 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 1 + .../user/shareupdates/client/view/ShareUpdateForm.java | 6 +++--- .../user/shareupdates/server/ShareUpdateServiceImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index 14d63e2..184b634 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -2,6 +2,7 @@ Ported to Java8 + Fix for bug #7630 diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java b/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java index ae1393b..64ce409 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java +++ b/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java @@ -539,7 +539,7 @@ public class ShareUpdateForm extends Composite { linkPreviewer = null; } - public void onSuccess(ClientFeed feed) { + public void onSuccess(ClientFeed post) { enableSubmitButtons(true); shareTextArea.setEnabled(true); shareTextArea.setText(SHARE_UPDATE_TEXT); @@ -547,13 +547,13 @@ public class ShareUpdateForm extends Composite { preview.clear(); linkPreviewer = null; - if (feed == null) + if (post == null) Window.alert("Ops! we encountered some problems delivering your message, please try again in a short while."); else { // publish a message with the refresh notification try { - pageBusAdapter.PageBusPublish("org.gcube.portal.databook.shared", feed, (Jsonizer)GWT.create(ClientFeedJsonizer.class)); + pageBusAdapter.PageBusPublish("org.gcube.portal.databook.shared", post, (Jsonizer)GWT.create(ClientFeedJsonizer.class)); } catch (PageBusAdapterException ex) { GWT.log(ex.getMessage()); diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java index f366774..b944d25 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java @@ -210,7 +210,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar //everything went fine ClientFeed cf = new ClientFeed(toShare.getKey(), toShare.getType().toString(), username, feedDate, toShare.getUri(), - TextTransfromUtils.replaceAmpersand(toShare.getDescription()), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(), + toShare.getDescription(), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(), toShare.getUriThumbnail(), toShare.getLinkHost(), null); @@ -385,7 +385,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar //everything went fine ClientFeed cf = new ClientFeed(toShare.getKey(), toShare.getType().toString(), username, feedDate, toShare.getUri(), - TextTransfromUtils.replaceAmpersand(toShare.getDescription()), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(), + toShare.getDescription(), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(), toShare.getUriThumbnail(), toShare.getLinkHost(), attachments);