diff --git a/.classpath b/.classpath index 06d708c..c120971 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -30,11 +30,11 @@ - + - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index e0b12e1..da00759 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -12,7 +13,8 @@ - + + @@ -25,7 +27,8 @@ - + + @@ -38,7 +41,8 @@ - + + @@ -51,7 +55,8 @@ - + + @@ -64,9 +69,11 @@ - + + - + + @@ -79,7 +86,8 @@ - + + @@ -92,7 +100,8 @@ - + + @@ -105,7 +114,8 @@ - + + diff --git a/CHANGELOG.md b/CHANGELOG.md index a2faa69..6cc5e52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,19 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v2.5.3-SNAPSHOT] -2 022-09-22 -## [v2.5.2] -2022-06-16 + - Fix Bug #23898: open with email addresse preset is not working anymore + +## [v2.5.2] - 2022-06-16 - Released for removal HL from portal -## [v2.5.1] -2021-09-09 +## [v2.5.1] - 2021-09-09 - Fixed attachment issue #21972 -## [v2.5.0] -2021-07-28 +## [v2.5.0] - 2021-07-28 - Ported to git @@ -21,7 +24,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Temporarely removed possibility to add attachments -## [v2.4.0] -2019-10-25 +## [v2.4.0] - 2019-10-25 - Bug #17876 the message menu isn't fully displayed if there is only one message or no other messages below diff --git a/pom.xml b/pom.xml index f4d9827..b058287 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portets.user messages war - 2.5.2 + 2.5.3-SNAPSHOT gCube Messages Portlet for exchanging messages with other users. diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/ApplicationView.java b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/ApplicationView.java index 00f3936..05f48c0 100755 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/ApplicationView.java +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/ApplicationView.java @@ -323,7 +323,8 @@ public class ApplicationView extends Composite { private void displayNewOrReplyMessage() { WRITING_MESSAGE = true; FAB.setVisible(false); - messagesCollection.clearActive(); + if (messagesCollection != null) + messagesCollection.clearActive(); scrollerPanel.clear(); scrollerPanel.add(newMessageDisplay); newMessageDisplay.setFocusOnUsersInput(); @@ -334,7 +335,10 @@ public class ApplicationView extends Composite { private void prepareNewMessageForSendTo(String[] usernamesToSendTo) { newMessageDisplay = new WriteMessage(convService, this); newMessageDisplay.setNewMessageForSendTo(usernamesToSendTo); + GWT.log("setNewMessageForSendTo - Done"); displayNewOrReplyMessage(); + GWT.log("displayNewOrReplyMessage - Done"); + } @UiHandler("newMessage") diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java index 421e7eb..d7cd8d6 100644 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java @@ -83,7 +83,7 @@ public class WriteMessage extends Composite { } public void setNewMessageForSendTo(String[] usernames) { - GWT.log("her add the users"); + GWT.log("setNewMessageForSendTo - here add the users"); convService.getUsersInfo(usernames, new AsyncCallback>() { @Override public void onFailure(Throwable caught) { @@ -91,7 +91,7 @@ public class WriteMessage extends Composite { @Override public void onSuccess(ArrayList result) { for (WSUser user : result) { - acModal.addItem(new UserSuggestion(user)); + acModal.addItem(new UserSuggestion(user)); } } });