From 7d843979698b4ba5ed6d4009654ce94910359524 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 2 Jul 2015 14:47:09 +0000 Subject: [PATCH] integrated widget for invitations git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/invite-friends-vre@115801 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 7 +- .settings/com.google.gwt.eclipse.core.prefs | 3 + .settings/org.eclipse.wst.common.component | 3 + pom.xml | 9 +- .../invitefriends/client/InviteFriends.java | 4 +- .../invitefriends/client/InviteService.java | 14 -- .../client/InviteServiceAsync.java | 12 -- .../invitefriends/client/ui/FormViewImpl.java | 164 ---------------- .../client/ui/FormViewImpl.ui.xml | 30 --- .../invitefriends/client/ui/InviteWidget.java | 35 ---- .../client/ui/InviteWidget.ui.xml | 8 - .../validation/FormErrorsValidation.java | 178 ------------------ .../client/validation/FormView.java | 57 ------ .../server/InviteServiceImpl.java | 68 ------- .../user/invitefriends/InviteFriends.gwt.xml | 2 +- .../client/Messages_fr.properties | 2 - src/main/webapp/WEB-INF/web.xml | 2 +- 17 files changed, 21 insertions(+), 577 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/user/invitefriends/client/InviteService.java delete mode 100644 src/main/java/org/gcube/portlets/user/invitefriends/client/InviteServiceAsync.java delete mode 100644 src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.java delete mode 100644 src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.ui.xml delete mode 100644 src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.java delete mode 100644 src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.ui.xml delete mode 100644 src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormErrorsValidation.java delete mode 100644 src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormView.java delete mode 100644 src/main/java/org/gcube/portlets/user/invitefriends/server/InviteServiceImpl.java delete mode 100644 src/main/resources/org/gcube/portlets/user/invitefriends/client/Messages_fr.properties diff --git a/.classpath b/.classpath index 4013f6e..415e590 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -33,5 +33,6 @@ - + + diff --git a/.settings/com.google.gwt.eclipse.core.prefs b/.settings/com.google.gwt.eclipse.core.prefs index f23a752..c803c44 100644 --- a/.settings/com.google.gwt.eclipse.core.prefs +++ b/.settings/com.google.gwt.eclipse.core.prefs @@ -1,2 +1,5 @@ +#Thu Jun 16 11:14:17 CEST 2011 eclipse.preferences.version=1 entryPointModules= +filesCopiedToWebInfLib=gwt-servlet.jar +gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBWy13YXIgc3JjL21haW4vd2ViYXBwXV0+PC9leHRyYS1hcmdzPjx2bS1hcmdzPjwhW0NEQVRBWy1YbXg1MTJtXV0+PC92bS1hcmdzPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLmNvbXBhbnkuU29tZU1vZHVsZTwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+ diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 7ae199b..477f178 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,9 @@ + + uses + uses diff --git a/pom.xml b/pom.xml index 5485341..a62752b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user invite-friends-vre war - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT Invite Friends to VRE scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/${project.artifactId} @@ -74,10 +74,15 @@ ${gwtVersion} provided + + org.gcube.portlets.widgets + invite-friends-widget + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + org.gcube.portal invites-common-library - [0.1.0-SNAPSHOT,) + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) org.gcube.portal diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteFriends.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteFriends.java index 2d6a9be..b3f0788 100644 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteFriends.java +++ b/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteFriends.java @@ -1,6 +1,6 @@ package org.gcube.portlets.user.invitefriends.client; -import org.gcube.portlets.user.invitefriends.client.ui.InviteWidget; +import org.gcube.portlets.widgets.inviteswidget.client.ui.InviteWidget; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.user.client.ui.RootPanel; @@ -14,6 +14,6 @@ public class InviteFriends implements EntryPoint { * This is the entry point method. */ public void onModuleLoad() { - RootPanel.get("invite-friends-DIV").add(new InviteWidget()); + RootPanel.get("invite-friends-DIV").add(new InviteWidget("Invite whoever's missing")); } } diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteService.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteService.java deleted file mode 100644 index fc45c03..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.gcube.portlets.user.invitefriends.client; - -import org.gcube.portal.databook.shared.InviteOperationResult; - -import com.google.gwt.user.client.rpc.RemoteService; -import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; - -/** - * The client side stub for the RPC service. - */ -@RemoteServiceRelativePath("greet") -public interface InviteService extends RemoteService { - InviteOperationResult sendInvite(String name, String lastName, String email) throws IllegalArgumentException; -} diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteServiceAsync.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteServiceAsync.java deleted file mode 100644 index 7427fbb..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteServiceAsync.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.gcube.portlets.user.invitefriends.client; - -import org.gcube.portal.databook.shared.InviteOperationResult; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public interface InviteServiceAsync { - - void sendInvite(String name, String lastName, String email, - AsyncCallback callback); - -} diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.java deleted file mode 100644 index 6f8de33..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.java +++ /dev/null @@ -1,164 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.invitefriends.client.ui; - -import org.gcube.portal.databook.shared.InviteOperationResult; -import org.gcube.portlets.user.invitefriends.client.InviteService; -import org.gcube.portlets.user.invitefriends.client.InviteServiceAsync; -import org.gcube.portlets.user.invitefriends.client.validation.FormView; - -import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.ControlGroup; -import com.github.gwtbootstrap.client.ui.HelpBlock; -import com.github.gwtbootstrap.client.ui.Modal; -import com.github.gwtbootstrap.client.ui.TextBox; -import com.github.gwtbootstrap.client.ui.constants.ControlGroupType; -import com.google.gwt.core.client.GWT; -import com.google.gwt.editor.client.Editor; -import com.google.gwt.editor.client.EditorDriver; -import com.google.gwt.editor.client.SimpleBeanEditorDriver; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.KeyCodes; -import com.google.gwt.event.dom.client.KeyDownEvent; -import com.google.gwt.event.dom.client.KeyDownHandler; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.uibinder.client.UiHandler; -import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.Widget; - -/** - * - * @author Massimiliano Assante, ISTI-CNR - * - */ -public class FormViewImpl extends Composite implements FormView, Editor { - - /** - * Create a remote service proxy to talk to the server-side service - */ - private final InviteServiceAsync service = GWT.create(InviteService.class); - - interface Binder extends UiBinder {} - private static Binder uiBinder = GWT.create(Binder.class); - - interface Driver extends SimpleBeanEditorDriver { } - private Driver driver = GWT.create(Driver.class); - - private final Delegate delegate; - - @UiField TextBox email; - @UiField TextBox name; - - @UiField Button openModal; - @UiField Button cancelInvite; - @UiField Button sendInvite; - @UiField Modal modalWindow; - @UiField HelpBlock nameErrors; - @UiField HelpBlock feedback; - - @UiField - ControlGroup nameGroup; - @UiField - ControlGroup feedbackGroup; - - public FormViewImpl(Delegate delegate) { - super(); - this.delegate = delegate; - initWidget(uiBinder.createAndBindUi(this)); - driver.initialize(this); - driver.edit(new UserDetails()); - - email.addKeyDownHandler(new KeyDownHandler() { - @Override - public void onKeyDown(KeyDownEvent event) { - if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) - openModal.click(); - } - }); - - name.addKeyDownHandler(new KeyDownHandler() { - @Override - public void onKeyDown(KeyDownEvent event) { - if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) - sendInvite.click(); - } - }); - - sendInvite.setEnabled(true); - } - - @UiHandler("openModal") - void onUserClick(ClickEvent event) { - if (!delegate.onSendClick()) { - sendInvite.setEnabled(true); - feedback.setText("We will send the invitation email to: "+email.getText() + " and put you in cc, we'll never email your contacts without your say so."); - name.setText(""); - modalWindow.show(); - Timer t = new Timer() { - @Override - public void run() { - name.setFocus(true); - } - }; - t.schedule(1000); - } - } - - @UiHandler("sendInvite") - void onSendInviteClick(ClickEvent event) { - if (delegate.onEmailSendInviteClick()) { - nameGroup.setType(ControlGroupType.ERROR); - nameErrors.setText("Name must not be null"); - } else { - nameGroup.setType(ControlGroupType.NONE); - nameErrors.setText(""); - service.sendInvite(name.getText(), "", email.getText(), new AsyncCallback() { - - @Override - public void onSuccess(InviteOperationResult result) { - switch (result) { - case SUCCESS: - feedback.setText("Thanks for inviting, we sent the email correctly."); - feedbackGroup.setType(ControlGroupType.SUCCESS); - break; - case ALREADY_INVITED: - feedback.setText("Thanks for inviting, however the user was already invited."); - feedbackGroup.setType(ControlGroupType.WARNING); - break; - case FAILED: - feedback.setText("Sorry, an error occurred in the server and we could not send the invite, please try again later."); - feedbackGroup.setType(ControlGroupType.ERROR); - break; - } - sendInvite.setEnabled(false); - cancelInvite.setText("Close"); - email.setText(""); - } - - @Override - public void onFailure(Throwable caught) { - feedback.setText("Sorry, an error occurred and we could not send the invite, please try again later."); - feedbackGroup.setType(ControlGroupType.ERROR); - sendInvite.setEnabled(false); - email.setText(""); - } - }); - } - } - - @UiHandler("cancelInvite") - public void onCancelClick(ClickEvent e) { - modalWindow.hide(); - email.setText(""); - } - - @Override - public EditorDriver getEditorDriver() { - return driver; - } -} - diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.ui.xml b/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.ui.xml deleted file mode 100644 index d103a9c..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.ui.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - Send Invite - - - - - - - - - - - - - - Cancel - Send Invite - - - - \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.java deleted file mode 100644 index 15c7883..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.gcube.portlets.user.invitefriends.client.ui; - -import org.gcube.portlets.user.invitefriends.client.validation.FormErrorsValidation; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.SimplePanel; -import com.google.gwt.user.client.ui.Widget; -/** - * - * @author Massimiliano Assante, ISTI-CNR - * - */ -public class InviteWidget extends Composite{ - - public static final String DISPLAY_NAME = "Invite whoever's missing"; - - private static InviteWidgetUiBinder uiBinder = GWT.create(InviteWidgetUiBinder.class); - - interface InviteWidgetUiBinder extends UiBinder { } - - @UiField HTML header; - @UiField SimplePanel validationErrorsFormPanel; - - public InviteWidget() { - super(); - initWidget(uiBinder.createAndBindUi(this)); - header.setText(DISPLAY_NAME); - new FormErrorsValidation().start(validationErrorsFormPanel, null); - } - -} diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.ui.xml b/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.ui.xml deleted file mode 100644 index 8101f43..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.ui.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormErrorsValidation.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormErrorsValidation.java deleted file mode 100644 index f17152a..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormErrorsValidation.java +++ /dev/null @@ -1,178 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.invitefriends.client.validation; - -import java.util.HashSet; -import java.util.Set; - -import javax.validation.ConstraintViolation; -import javax.validation.Path; -import javax.validation.metadata.ConstraintDescriptor; - -import org.gcube.portlets.user.invitefriends.client.ui.FormViewImpl; -import org.gcube.portlets.user.invitefriends.client.validation.FormView.UserDetails; - -import com.google.gwt.activity.shared.AbstractActivity; -import com.google.gwt.editor.client.EditorDriver; -import com.google.gwt.event.shared.EventBus; -import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.google.gwt.validation.client.impl.PathImpl; - -/** - * - * @author Massimiliano Assante, ISTI-CNR - * - */ -public class FormErrorsValidation extends AbstractActivity implements FormView.Delegate { - - private FormView view; - /** - * @see com.google.gwt.activity.shared.Activity#start(com.google.gwt.user.client.ui.AcceptsOneWidget, com.google.gwt.event.shared.EventBus) - */ - @Override - public void start(AcceptsOneWidget panel, EventBus eventBus) { - view = new FormViewImpl(this); - panel.setWidget(view); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public boolean onSendClick() { - EditorDriver editorDriver = view.getEditorDriver(); - UserDetails details = editorDriver.flush(); - Set> violations = validateEmailTextBox(details); - //decorate widgets implementing HasEditorErrors with validation messages - return editorDriver.setConstraintViolations( (Set) violations); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public boolean onEmailSendInviteClick() { - EditorDriver editorDriver = view.getEditorDriver(); - UserDetails details = editorDriver.flush(); - Set> violations = validateName(details); - return !violations.isEmpty(); - } - - private Set> validateName(UserDetails user2InviteBean) { - Set> violations = new HashSet>(); - if(user2InviteBean.getName() == null || "".equals(user2InviteBean.getName().trim())) { - violations.add(buildNotNullConstraintViolation(user2InviteBean, "name")); - } - return violations; - } - - private Set> validateEmailTextBox(UserDetails user2InviteBean){ - Set> violations = new HashSet>(); - if(user2InviteBean.getEmail() == null || "".equals(user2InviteBean.getEmail().trim())) { - violations.add(buildNotNullConstraintViolation(user2InviteBean, "email")); - } - else if (!isValidEmailAddress(user2InviteBean.getEmail())) { - violations.add(buildInvalidEmailAddressConstraintViolation(user2InviteBean, "email")); - } - - return violations; - } - - - private ConstraintViolation buildNotNullConstraintViolation(final UserDetails bean, final String path) { - return new ConstraintViolation() { - @Override - public String getMessage() { - return "must not be empty"; - } - @Override - public String getMessageTemplate() { - return null; - } - @Override - public UserDetails getRootBean() { - return bean; - } - @Override - public Class getRootBeanClass() { - return UserDetails.class; - } - @Override - public Object getLeafBean() { - return bean; - } - - @Override - public Path getPropertyPath() { - return new PathImpl().append(path); - } - - @Override - public Object getInvalidValue() { - return null; - } - @Override - public ConstraintDescriptor getConstraintDescriptor() { - return null; - } - }; - } - - private ConstraintViolation buildInvalidEmailAddressConstraintViolation(final UserDetails bean, final String path) { - return new ConstraintViolation() { - @Override - public String getMessage() { - return "email address must be valid"; - } - @Override - public String getMessageTemplate() { - return null; - } - @Override - public UserDetails getRootBean() { - return bean; - } - @Override - public Class getRootBeanClass() { - return UserDetails.class; - } - @Override - public Object getLeafBean() { - return bean; - } - - @Override - public Path getPropertyPath() { - return new PathImpl().append(path); - } - - @Override - public Object getInvalidValue() { - return null; - } - @Override - public ConstraintDescriptor getConstraintDescriptor() { - return null; - } - }; - } - /** - * - * @param emailValue - * @return - */ - private boolean isValidEmailAddress(String emailValue) { - if(emailValue == null) return true; - - String emailPattern = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.(?:[a-zA-Z]{2,6})$"; - - boolean valid = false; - - if(emailValue.getClass().toString().equals(String.class.toString())) { - valid = ((String)emailValue).matches(emailPattern); - } else { - valid = ((Object)emailValue).toString().matches(emailPattern); - } - - return valid; -} - - -} diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormView.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormView.java deleted file mode 100644 index 6276d6e..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormView.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.invitefriends.client.validation; - -import com.google.gwt.editor.client.EditorDriver; -import com.google.gwt.user.client.ui.IsWidget; - -/** - * - * @author Massimiliano Assante, ISTI-CNR - * - */ -public interface FormView extends IsWidget { - - public static class UserDetails { - String email; - String name; - String lastName; - - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - public String getLastName() { - return lastName; - } - public void setLastName(String lastName) { - this.lastName = lastName; - } - @Override - public String toString() { - return "UserDetails [email=" + email + ", name=" + name - + ", lastName=" + lastName + "]"; - } - - } - - public interface Delegate { - boolean onSendClick(); - - boolean onEmailSendInviteClick(); - } - - - - EditorDriver getEditorDriver(); -} diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/server/InviteServiceImpl.java b/src/main/java/org/gcube/portlets/user/invitefriends/server/InviteServiceImpl.java deleted file mode 100644 index 958d6cb..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/server/InviteServiceImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.gcube.portlets.user.invitefriends.server; - -import org.gcube.application.framework.core.session.ASLSession; -import org.gcube.application.framework.core.session.SessionManager; -import org.gcube.common.portal.PortalContext; -import org.gcube.portal.custom.communitymanager.OrganizationsUtil; -import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; -import org.gcube.portal.databook.shared.InviteOperationResult; -import org.gcube.portal.invites.InvitesManager; -import org.gcube.portlets.user.invitefriends.client.InviteService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.gwt.user.server.rpc.RemoteServiceServlet; -import com.liferay.portal.service.OrganizationLocalServiceUtil; -import com.liferay.portal.util.PortalUtil; - -/** - * The server side implementation of the RPC service. - */ -@SuppressWarnings("serial") -public class InviteServiceImpl extends RemoteServiceServlet implements InviteService { - - private final static Logger _log = LoggerFactory.getLogger(InviteServiceImpl.class); - - /** - * the current ASLSession - * @return the session - */ - private ASLSession getASLSession() { - String sessionID = this.getThreadLocalRequest().getSession().getId(); - String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE); - if (user == null) { - _log.warn("USER IS NULL setting test.user"); - user = "test.user"; - } - else { - _log.info("LIFERAY PORTAL DETECTED user=" + user); - } - return SessionManager.getInstance().getASLSession(sessionID, user); - } - /** - * - */ - @Override - public InviteOperationResult sendInvite(String name, String lastName, String email) throws IllegalArgumentException { - ASLSession aslSession = getASLSession(); - - String portalUrl = null; - String vreDescription = null; - long organizationId = getASLSession().getGroupId(); - try { - portalUrl = PortalUtil.getPortalURL(OrganizationsUtil.getCompany().getVirtualHost(), PortalUtil.getPortalPort(), true); - vreDescription = OrganizationLocalServiceUtil.getOrganization(organizationId).getComments(); - } catch (Exception e1) { - e1.printStackTrace(); - _log.warn("While trying to send email for invitation to " + email); - return null; - } - String portalSenderEmail = PortalContext.getConfiguration().getSenderEmail(); - return InvitesManager.getInstance().sendInvite(aslSession, portalSenderEmail, portalUrl, name, lastName, email, vreDescription); - } - - - - - -} diff --git a/src/main/resources/org/gcube/portlets/user/invitefriends/InviteFriends.gwt.xml b/src/main/resources/org/gcube/portlets/user/invitefriends/InviteFriends.gwt.xml index a187d24..44591fd 100644 --- a/src/main/resources/org/gcube/portlets/user/invitefriends/InviteFriends.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/invitefriends/InviteFriends.gwt.xml @@ -4,7 +4,7 @@ - + diff --git a/src/main/resources/org/gcube/portlets/user/invitefriends/client/Messages_fr.properties b/src/main/resources/org/gcube/portlets/user/invitefriends/client/Messages_fr.properties deleted file mode 100644 index b4a7627..0000000 --- a/src/main/resources/org/gcube/portlets/user/invitefriends/client/Messages_fr.properties +++ /dev/null @@ -1,2 +0,0 @@ -sendButton = Envoyer -nameField = Entrez votre nom \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index a54af90..8659dda 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -8,7 +8,7 @@ greetServlet - org.gcube.portlets.user.invitefriends.server.InviteServiceImpl + org.gcube.portlets.widgets.inviteswidget.server.InviteServiceImpl