From c4c1cd56233dcbe24c9983d0460b451b56f6e55c Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 22 Sep 2014 14:58:57 +0000 Subject: [PATCH] update multi drag hide event git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-sharing-widget@100109 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/SimpleMultiDragContact.java | 2 +- .../client/view/sharing/DialogShareWItem.java | 2 +- .../client/view/sharing/SmartShare.java | 2 +- .../sharing/multisuggest/MultiDragContact.java | 14 ++++++++++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/SimpleMultiDragContact.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/SimpleMultiDragContact.java index 8530f6f..dded1c4 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/SimpleMultiDragContact.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/SimpleMultiDragContact.java @@ -26,7 +26,7 @@ public class SimpleMultiDragContact { private UserStore userStore = new UserStore(); private LOAD_CONTACTS_AS loadContactAs; public static enum LOAD_CONTACTS_AS{SHARED_USER, ADMINISTRATOR} - private MultiDragContact multiDragContact = new MultiDragContact(false); + private MultiDragContact multiDragContact = new MultiDragContact(false, false); private List targets = new ArrayList(); private boolean readGroupsFromPortal; private boolean readGroupsFromHL; 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 9c5f3db..8696543 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 @@ -340,7 +340,7 @@ public class DialogShareWItem extends Dialog { @Override public void onClick(ClickEvent event) { - final MultiDragContact multiDrag = new MultiDragContact(true); + final MultiDragContact multiDrag = new MultiDragContact(true,true); multiDrag.show(); List exclusiveContacts = userStore.getExclusiveContactsFromAllContact(suggestPanel.getSelectedUser()); 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 5e87521..9712613 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 @@ -295,7 +295,7 @@ public class SmartShare extends Dialog implements SmartDialogInterface{ @Override public void onClick(ClickEvent event) { - final MultiDragContact multiDrag = new MultiDragContact(true); + final MultiDragContact multiDrag = new MultiDragContact(true,true); multiDrag.show(); List exclusiveContacts = userStore.getExclusiveContactsFromAllContact(suggestPanel.getSelectedUser()); diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/multisuggest/MultiDragContact.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/multisuggest/MultiDragContact.java index 9560f52..7757bb6 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/multisuggest/MultiDragContact.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/view/sharing/multisuggest/MultiDragContact.java @@ -18,7 +18,6 @@ import com.extjs.gxt.ui.client.event.BaseEvent; import com.extjs.gxt.ui.client.event.ButtonEvent; import com.extjs.gxt.ui.client.event.Events; import com.extjs.gxt.ui.client.event.Listener; -import com.extjs.gxt.ui.client.event.MessageBoxEvent; import com.extjs.gxt.ui.client.event.SelectionListener; import com.extjs.gxt.ui.client.store.ListStore; import com.extjs.gxt.ui.client.store.Store; @@ -65,8 +64,15 @@ public class MultiDragContact extends Dialog { private Button buttonSelectedRight; private Button buttonAllRight; private Button buttonAllLeft; + private boolean hideOnPressOkButton; - public MultiDragContact(boolean visibleAlreadyShared) { + /** + * + * @param visibleAlreadyShared + * @param hideOnPressOk + */ + public MultiDragContact(boolean visibleAlreadyShared, boolean hideOnPressOk) { + this.hideOnPressOkButton = hideOnPressOk; setStyleAttribute("margin", "10px"); setSize(WIDTH_DIALOG, HEIGHT_DIALOG); setHeading("Group dragging contacts"); @@ -291,8 +297,8 @@ public class MultiDragContact extends Dialog { } else hide(); */ - - hide(); + if(hideOnPressOkButton) + hide(); } });