[syncope] branch master updated: restored copy to clipboard in topology section

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andreapatricelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new b153920  restored copy to clipboard in topology section
b153920 is described below

commit b1539207a4d106aa9b7d443afcecf6adf22541c7
Author: Andrea Patricelli <an...@apache.org>
AuthorDate: Thu Jan 31 12:19:15 2019 +0100

    restored copy to clipboard in topology section
---
 .../syncope/client/console/topology/TopologyTogglePanel.java | 12 ++++++++++++
 .../apache/syncope/client/console/panels/TogglePanel.java    |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
index 310aa13..a309d0e 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
@@ -41,6 +41,7 @@ import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.Bas
 import org.apache.syncope.client.console.wicket.markup.html.form.IndicatingOnConfirmAjaxLink;
 import org.apache.syncope.client.console.wizards.AjaxWizard;
 import org.apache.syncope.client.console.wizards.resources.AbstractResourceWizardBuilder;
+import org.apache.syncope.client.console.wizards.resources.ResourceProvision;
 import org.apache.syncope.client.console.wizards.resources.ResourceProvisionPanel;
 import org.apache.syncope.common.lib.SyncopeClientException;
 import org.apache.syncope.common.lib.to.ConnInstanceTO;
@@ -160,6 +161,17 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
         toggle(target, node, true);
     }
 
+    @Override
+    protected String getTargetKey(final Serializable modelObject) {
+        String key = super.getTargetKey(modelObject);
+        if (modelObject instanceof ResourceProvision) {
+            key = ((ResourceProvision) modelObject).getKey();
+        } else if (modelObject instanceof TopologyNode) {
+            key = ((TopologyNode) modelObject).getKey();
+        }
+        return key;
+    }
+
     private Fragment getEmptyFragment() {
         return new Fragment("actions", "emptyFragment", this);
     }
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
index 6affe65..f49befa 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
@@ -161,7 +161,7 @@ public abstract class TogglePanel<T extends Serializable> extends WizardMgtPanel
     }
 
     @SuppressWarnings("cast")
-    private String getTargetKey(final Serializable modelObject) {
+    protected String getTargetKey(final Serializable modelObject) {
         final String key;
         if (modelObject == null) {
             key = new ResourceModel("actions", StringUtils.EMPTY).getObject();