From c3d2f0d456728d420bbd70d8dd6a0d83d22f92ec Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 31 Mar 2016 10:33:44 +0000 Subject: [PATCH] ported to liferay 6.2 git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/join-vre@126439 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 3 +++ .../joinvre/client/responsive/ResponsivePanel.java | 13 +++++++++++-- .../joinvre/client/ui/RequestMembershipDialog.java | 9 +++++++-- .../user/joinvre/client/ui/VreThumbnail.java | 12 ++++++++++-- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index 4b72edf..89bca21 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,7 @@ + + Ported to Liferay 6.2 + Refactored to support virtual groups and related descriptions diff --git a/src/main/java/org/gcube/portlets/user/joinvre/client/responsive/ResponsivePanel.java b/src/main/java/org/gcube/portlets/user/joinvre/client/responsive/ResponsivePanel.java index 819aae8..07d7f8a 100644 --- a/src/main/java/org/gcube/portlets/user/joinvre/client/responsive/ResponsivePanel.java +++ b/src/main/java/org/gcube/portlets/user/joinvre/client/responsive/ResponsivePanel.java @@ -26,7 +26,7 @@ public class ResponsivePanel extends Composite { public static final String loading = GWT.getModuleBaseURL() + "../images/vre-loader.gif"; private VerticalPanel mainPanel = new VerticalPanel(); - + private ArrayList myThumbnails = new ArrayList(); public ResponsivePanel() { GWT.log("ResponsivePanel()"); joinService.getVREs(new AsyncCallback>>() { @@ -64,6 +64,7 @@ public class ResponsivePanel extends Composite { Thumbnails toReturn = new Thumbnails(); for (VRE vre : vres) { VreThumbnail thumb = new VreThumbnail(vre); + myThumbnails.add(thumb); toReturn.add(thumb); } return toReturn; @@ -76,7 +77,7 @@ public class ResponsivePanel extends Composite { public void requestMembership(VRE vre) { if (vre.isUponRequest()) { - RequestMembershipDialog modal = new RequestMembershipDialog(vre); + RequestMembershipDialog modal = new RequestMembershipDialog(this, vre); modal.show(); } else { AccessVREDialog modal = new AccessVREDialog(vre); @@ -88,6 +89,14 @@ public class ResponsivePanel extends Composite { AccessViaInviteDialog modal = new AccessViaInviteDialog(vre, inviteId); modal.show(); } + + public void setPending(VRE toSet) { + for (VreThumbnail thumb : myThumbnails) { + if (thumb.getMyVre().getinfraScope().compareTo(toSet.getinfraScope()) == 0) { + thumb.setPending(); + } + } + } } diff --git a/src/main/java/org/gcube/portlets/user/joinvre/client/ui/RequestMembershipDialog.java b/src/main/java/org/gcube/portlets/user/joinvre/client/ui/RequestMembershipDialog.java index 83c426e..1516098 100644 --- a/src/main/java/org/gcube/portlets/user/joinvre/client/ui/RequestMembershipDialog.java +++ b/src/main/java/org/gcube/portlets/user/joinvre/client/ui/RequestMembershipDialog.java @@ -2,6 +2,7 @@ package org.gcube.portlets.user.joinvre.client.ui; import org.gcube.portlets.user.joinvre.client.JoinService; import org.gcube.portlets.user.joinvre.client.JoinServiceAsync; +import org.gcube.portlets.user.joinvre.client.responsive.ResponsivePanel; import org.gcube.portlets.user.joinvre.shared.VRE; import com.github.gwtbootstrap.client.ui.Button; @@ -31,11 +32,13 @@ public class RequestMembershipDialog extends Composite { @UiField Button confirmRequest; @UiField TextArea optionalText; @UiField HelpBlock helpBlock; - VRE myVRE = null; + private VRE myVRE = null; + private ResponsivePanel responsivePanel; - public RequestMembershipDialog(VRE myVRE) { + public RequestMembershipDialog(ResponsivePanel responsivePanel, VRE myVRE) { initWidget(uiBinder.createAndBindUi(this)); this.myVRE = myVRE; + this.responsivePanel = responsivePanel; optionalText.setWidth("95%"); optionalText.setPlaceholder("You can add an optional comment here"); } @@ -59,6 +62,8 @@ public class RequestMembershipDialog extends Composite { optionalText.removeFromParent(); m.setTitle("Thank you, your request has been sent successfully"); helpBlock.setText("You will receive an email as soon as your request will be processed."); + responsivePanel.setPending(myVRE); + confirmRequest.setEnabled(false); } @Override public void onFailure(Throwable caught) { diff --git a/src/main/java/org/gcube/portlets/user/joinvre/client/ui/VreThumbnail.java b/src/main/java/org/gcube/portlets/user/joinvre/client/ui/VreThumbnail.java index 3c699a5..6bef41c 100644 --- a/src/main/java/org/gcube/portlets/user/joinvre/client/ui/VreThumbnail.java +++ b/src/main/java/org/gcube/portlets/user/joinvre/client/ui/VreThumbnail.java @@ -82,8 +82,6 @@ public class VreThumbnail extends Composite { @Override public void onSuccess(String currentGroupName) { Location.assign("/group/" +currentGroupName +"/explore?"+JoinVRE.GET_OID_PARAMETER+"="+myVre.getId()); - //RequestMembershipDialog modal = new RequestMembershipDialog(currentGroupName); - //modal.show(); } }); } @@ -96,5 +94,15 @@ public class VreThumbnail extends Composite { InfoPanel modal = new InfoPanel(myVre); modal.show(); } + + public void setPending() { + joinButton.setText("Waiting approval"); + joinButton.setType(ButtonType.WARNING); + joinButton.setEnabled(false); + } + + public VRE getMyVre() { + return myVre; + } }