You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/04/15 10:55:28 UTC
[syncope] branch master updated: [SYNCOPE-1531] Do not show CSV
import / export buttons in modal windows
This is an automated email from the ASF dual-hosted git repository.
ilgrosso 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 60c35ee [SYNCOPE-1531] Do not show CSV import / export buttons in modal windows
60c35ee is described below
commit 60c35ee235cb54f465062ca3d280cebd46e87831
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Apr 15 12:55:16 2020 +0200
[SYNCOPE-1531] Do not show CSV import / export buttons in modal windows
---
.../commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java | 3 +++
.../console/commons/AnyDirectoryPanelAdditionalActionsProvider.java | 1 +
.../commons/IdRepoAnyDirectoryPanelAdditionalActionsProvider.java | 1 +
.../org/apache/syncope/client/console/panels/AnyDirectoryPanel.java | 4 ++--
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
index 8a6edbe..5563321 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
@@ -65,6 +65,7 @@ public class IdMAnyDirectoryPanelAdditionalActionsProvider implements AnyDirecto
public void add(
final AnyDirectoryPanel<?, ?> panel,
final BaseModal<?> modal,
+ final boolean wizardInModal,
final WebMarkupContainer container,
final String type,
final String realm,
@@ -147,6 +148,7 @@ public class IdMAnyDirectoryPanelAdditionalActionsProvider implements AnyDirecto
modal.show(true);
}
};
+ csvPushLink.setOutputMarkupPlaceholderTag(true).setVisible(wizardInModal).setEnabled(wizardInModal);
MetaDataRoleAuthorizationStrategy.authorize(csvPushLink, Component.RENDER,
String.format("%s,%s", IdRepoEntitlement.IMPLEMENTATION_LIST, IdRepoEntitlement.TASK_EXECUTE));
panel.addInnerObject(csvPushLink.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
@@ -166,6 +168,7 @@ public class IdMAnyDirectoryPanelAdditionalActionsProvider implements AnyDirecto
modal.show(true);
}
};
+ csvPullLink.setOutputMarkupPlaceholderTag(true).setVisible(wizardInModal).setEnabled(wizardInModal);
MetaDataRoleAuthorizationStrategy.authorize(csvPullLink, Component.RENDER,
String.format("%s,%s", IdRepoEntitlement.IMPLEMENTATION_LIST, IdRepoEntitlement.TASK_EXECUTE));
panel.addInnerObject(csvPullLink.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDirectoryPanelAdditionalActionsProvider.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDirectoryPanelAdditionalActionsProvider.java
index 4414c75..daeec5a 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDirectoryPanelAdditionalActionsProvider.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDirectoryPanelAdditionalActionsProvider.java
@@ -29,6 +29,7 @@ public interface AnyDirectoryPanelAdditionalActionsProvider extends Serializable
void add(AnyDirectoryPanel<?, ?> panel,
BaseModal<?> modal,
+ boolean wizardInModal,
WebMarkupContainer container,
String type,
String realm,
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoAnyDirectoryPanelAdditionalActionsProvider.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoAnyDirectoryPanelAdditionalActionsProvider.java
index e034836..4402f26 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoAnyDirectoryPanelAdditionalActionsProvider.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/IdRepoAnyDirectoryPanelAdditionalActionsProvider.java
@@ -34,6 +34,7 @@ public class IdRepoAnyDirectoryPanelAdditionalActionsProvider implements AnyDire
public void add(
final AnyDirectoryPanel<?, ?> panel,
final BaseModal<?> modal,
+ final boolean wizardInModal,
final WebMarkupContainer container,
final String type,
final String realm,
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
index c81dab8..a59b9ae 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
@@ -138,8 +138,8 @@ public abstract class AnyDirectoryPanel<A extends AnyTO, E extends AbstractAnyRe
initResultTable();
- SyncopeWebApplication.get().getAnyDirectoryPanelAdditionalActionsProvider().
- add(this, modal, container, type, realm, fiql, rows, pSchemaNames, dSchemaNames, pageRef);
+ SyncopeWebApplication.get().getAnyDirectoryPanelAdditionalActionsProvider().add(
+ this, modal, wizardInModal, container, type, realm, fiql, rows, pSchemaNames, dSchemaNames, pageRef);
}
@Override