From 486be86cecee4abd9c305ba03b522b4c2eebc14f Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 4 Mar 2014 14:07:29 +0000 Subject: [PATCH] updated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-sharing-widget@92618 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/WorkspaceSharingController.java | 1 + .../client/view/sharing/DialogShareWItem.java | 7 +++++++ .../client/view/sharing/SmartShare.java | 16 ++++++++++++++-- .../sharing/multisuggest/MultiValuePanel.java | 2 ++ .../server/WorkspaceSharingServiceImpl.java | 6 +++--- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingController.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingController.java index 8965dd7..ecf1526 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingController.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingController.java @@ -76,6 +76,7 @@ public class WorkspaceSharingController { @Override public void onFailure(Throwable caught) { sharingDialog.unmask(); + sharingDialog.setAsError(caught.getMessage()); MessageBox.alert("Error", caught.getMessage(), null); } diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/DialogShareWItem.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/DialogShareWItem.java index 7e7ecfc..134c0c0 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/DialogShareWItem.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/DialogShareWItem.java @@ -19,6 +19,7 @@ import com.extjs.gxt.ui.client.event.ButtonEvent; import com.extjs.gxt.ui.client.event.SelectionListener; import com.extjs.gxt.ui.client.widget.Dialog; import com.extjs.gxt.ui.client.widget.HorizontalPanel; +import com.extjs.gxt.ui.client.widget.Html; import com.extjs.gxt.ui.client.widget.LayoutContainer; import com.extjs.gxt.ui.client.widget.MessageBox; import com.extjs.gxt.ui.client.widget.form.TextArea; @@ -263,6 +264,12 @@ public class DialogShareWItem extends Dialog { permission.setEnabled(bool); } + public void setAsError(String message){ + enableFormDialog(false); + this.add(new Html("

"+message+"

")); + this.layout(); + } + /** * * @return diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/SmartShare.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/SmartShare.java index c5357bc..624667f 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/SmartShare.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/SmartShare.java @@ -19,6 +19,7 @@ import com.extjs.gxt.ui.client.Style.Scroll; import com.extjs.gxt.ui.client.event.ButtonEvent; import com.extjs.gxt.ui.client.event.SelectionListener; import com.extjs.gxt.ui.client.widget.Dialog; +import com.extjs.gxt.ui.client.widget.Html; import com.extjs.gxt.ui.client.widget.LayoutContainer; import com.extjs.gxt.ui.client.widget.MessageBox; import com.extjs.gxt.ui.client.widget.form.TextField; @@ -133,8 +134,8 @@ public class SmartShare extends Dialog{ public void onSuccess(List result) { for (InfoContactModel infoContactModel : result) { if(infoContactModel.getName()!=null){ - listAlreadyShared.add(infoContactModel); - suggestPanel.addRecipient(infoContactModel.getName(),false); + listAlreadyShared.add(infoContactModel); + suggestPanel.addRecipient(infoContactModel.getName(),false); layout(); } } @@ -344,6 +345,17 @@ public class SmartShare extends Dialog{ } + + public void setAsError(String message){ + enableFormDialog(false); + this.add(new Html("

"+message+"

")); + this.layout(); + } + + private void enableFormDialog(boolean bool){ + getButtonById(Dialog.OK).setEnabled(bool); + buttonMultiDrag.setEnabled(bool); + } public String getName() { return txtName.getValue(); diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/multisuggest/MultiValuePanel.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/multisuggest/MultiValuePanel.java index e78dd5f..0bb37e4 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/multisuggest/MultiValuePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/multisuggest/MultiValuePanel.java @@ -7,6 +7,7 @@ import java.util.List; import org.gcube.portlets.widgets.workspacesharingwidget.client.view.sharing.ContactFetcher; import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; +import com.extjs.gxt.ui.client.widget.MessageBox; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -191,6 +192,7 @@ public class MultiValuePanel extends Composite { @Override public void onFailure(Throwable caught) { GWT.log("Error on loading contacts"); + MessageBox.alert("Error", caught.getMessage(), null); } @Override diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java index 68e04c2..9bd059d 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java @@ -76,16 +76,16 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements public List getAllContacts() throws Exception { try { - + WsUtil.getAslSession(this.getThreadLocalRequest().getSession()); //THIS FORCE THE SESSION CREATION logger.info("Get all contacts"); // WorkspaceItem parent = workspace.getItem(parentFileModel.getIdentifier()); //get item from workspace -// workspace.getAllScope(); +// workspace.getAllScope(); GWTWorkspaceSharingBuilder builder = getGWTWorkspaceBuilder(); if(isTestMode()){ - + logger.info("WORKSPACE PORTLET IS IN TEST MODE - RETURN TEST USERS"); logger.warn("WORKSPACE PORTLET IS IN TEST MODE - RETURN TEST USERS"); List listContactsModel = new ArrayList(); // //TEST USERS