From 014b38ba7f747721ab8d5599d0cff86370c480b2 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 10 Jun 2015 16:34:29 +0000 Subject: [PATCH] 81: Allow the creation and use of expressions on multi column in TDM portlet Task-Url: https://support.d4science.org/issues/81 Updated Rules on Table git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@115306 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gcube/portlets/user/td/client/TabularDataController.java | 4 ++-- .../org/gcube/portlets/user/td/tabulardataportlet.gwt.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index 3e2f51c..ee8e74b 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -33,7 +33,7 @@ import org.gcube.portlets.user.td.mapwidget.client.MapWidgetTD; import org.gcube.portlets.user.td.openwidget.client.TDOpen; import org.gcube.portlets.user.td.replacebyexternalwidget.client.ReplaceByExternalTD; import org.gcube.portlets.user.td.rulewidget.client.RuleActiveDialog; -import org.gcube.portlets.user.td.rulewidget.client.RuleApplyDialog; +import org.gcube.portlets.user.td.rulewidget.client.RuleOnColumnApplyDialog; import org.gcube.portlets.user.td.rulewidget.client.RuleDeleteDialog; import org.gcube.portlets.user.td.rulewidget.client.RuleOpenDialog; import org.gcube.portlets.user.td.rulewidget.client.RuleShareDialog; @@ -1806,7 +1806,7 @@ public class TabularDataController { public void onSuccess() { Log.debug("Request Open On Column Apply Rule Dialog"); if (trId != null) { - RuleApplyDialog raDialog = new RuleApplyDialog(trId, + RuleOnColumnApplyDialog raDialog = new RuleOnColumnApplyDialog(trId, eventBus); raDialog.show(); } else { diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index 84e083f..ef227f4 100644 --- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -107,7 +107,7 @@ - +