diff --git a/distro/changelog.xml b/distro/changelog.xml index def67e7..61f1671 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Fixed share of rules [Ticket #3483] + Fixed dependencies diff --git a/pom.xml b/pom.xml index c167e02..5a5eddc 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-rule-widget - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT tabular-data-rule-widget diff --git a/src/main/java/org/gcube/portlets/user/td/rulewidget/client/RuleShareDialog.java b/src/main/java/org/gcube/portlets/user/td/rulewidget/client/RuleShareDialog.java index 1728a22..eb09267 100644 --- a/src/main/java/org/gcube/portlets/user/td/rulewidget/client/RuleShareDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/rulewidget/client/RuleShareDialog.java @@ -1,8 +1,11 @@ package org.gcube.portlets.user.td.rulewidget.client; import org.gcube.portlets.user.td.gwtservice.shared.rule.description.RuleDescriptionData; +import org.gcube.portlets.user.td.gwtservice.shared.user.UserInfo; import org.gcube.portlets.user.td.rulewidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.sharewidget.client.RuleShare; +import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages; +import org.gcube.portlets.user.td.wizardwidget.client.util.UtilsGXT3; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.shared.GWT; @@ -19,24 +22,27 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; */ public class RuleShareDialog extends Window { private static final String WIDTH = "770px"; - private static final String HEIGHT = "530px"; - + private static final String HEIGHT = "530px"; + private EventBus eventBus; private RuleShareMessages msgs; + private UserInfo userInfo; + private CommonMessages msgsCommon; - public RuleShareDialog(EventBus eventBus) { + public RuleShareDialog(UserInfo userInfo, EventBus eventBus) { this.eventBus = eventBus; + this.userInfo = userInfo; initMessages(); initWindow(); - RuleSharePanel templateDeletePanel = new RuleSharePanel(this, - eventBus); + RuleSharePanel templateDeletePanel = new RuleSharePanel(this, eventBus); add(templateDeletePanel); } - + protected void initMessages() { msgs = GWT.create(RuleShareMessages.class); + msgsCommon = GWT.create(CommonMessages.class); } - + protected void initWindow() { setWidth(WIDTH); setHeight(HEIGHT); @@ -70,12 +76,17 @@ public class RuleShareDialog extends Window { hide(); } - public void ruleShare(RuleDescriptionData ruleDescriptionData) { Log.debug("Share Window"); - @SuppressWarnings("unused") - RuleShare ruleShare = new RuleShare(ruleDescriptionData, eventBus); - close(); + if (userInfo.getUsername().compareTo( + ruleDescriptionData.getOwnerLogin()) == 0) { + @SuppressWarnings("unused") + RuleShare ruleShare = new RuleShare(userInfo, ruleDescriptionData, eventBus); + close(); + } else { + UtilsGXT3 + .info(msgsCommon.attention(), msgs.attentionNotOwnerRule()); + } } diff --git a/src/main/java/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages.java b/src/main/java/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages.java index 0581944..2749e0f 100644 --- a/src/main/java/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages.java @@ -12,38 +12,41 @@ public interface RuleShareMessages extends Messages { @DefaultMessage("Share Rule") String dialogRuleShareHead(); - + @DefaultMessage("Name") String nameCol(); - + @DefaultMessage("Description") String descriptionCol(); @DefaultMessage("Owner") String ownerCol(); - + @DefaultMessage("Creation Date") String creationDateCol(); - + @DefaultMessage("Scope") String scopeCol(); - + @DefaultMessage("Share") String btnShareText(); - + @DefaultMessage("Share") String btnShareToolTip(); - + @DefaultMessage("Error retrieving rules") String errorRetrievingRulesHead(); - + @DefaultMessage("Error retrieving rules!") String errorRetrievingRules(); - + @DefaultMessage("Select the rule") String selectTheRule(); - + @DefaultMessage("Info") String infoItemText(); - + + @DefaultMessage("In order to share a rule you must be the owner of the rule. You are not the owner of this rule!") + String attentionNotOwnerRule(); + } diff --git a/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages.properties b/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages.properties index e56d2e3..ef41f1a 100644 --- a/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages.properties +++ b/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages.properties @@ -9,4 +9,6 @@ btnShareToolTip = Share errorRetrievingRulesHead = Error retrieving rules errorRetrievingRules = Error retrieving rules! selectTheRule = Select the rule -infoItemText = Info \ No newline at end of file +infoItemText = Info +attentionNotOwnerRule = In order to share a rule you must be the owner of the rule. \ +You are not the owner of this rule! \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages_es.properties index 1a6c0aa..283e573 100644 --- a/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages_es.properties @@ -9,4 +9,6 @@ btnShareToolTip = Compartir regla errorRetrievingRulesHead = Error al recuperar las reglas errorRetrievingRules = Error al recuperar las reglas! selectTheRule = Seleccione la regla! -infoItemText = Info \ No newline at end of file +infoItemText = Info +attentionNotOwnerRule = Con el fin de compartir una regla que debe ser el propietario de la regla. \ +No eres el propietario de esta regla! \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages_it.properties index 5798b5c..cbed51d 100644 --- a/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages_it.properties +++ b/src/main/resources/org/gcube/portlets/user/td/rulewidget/client/RuleShareMessages_it.properties @@ -10,3 +10,5 @@ errorRetrievingRulesHead = Errore recuperando le regole errorRetrievingRules = Errore recuperando le regole! selectTheRule = Seleziona la regola! infoItemText = Info +attentionNotOwnerRule = Per poter condividere una regola bisogna essere il proprietario. \ +Tu non sei il propietario di questa regola! \ No newline at end of file