You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/02/04 12:41:51 UTC
[syncope] 02/04: fix issues after review
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-1506
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 8557c17b43f788cc5ef12663dceb79448e7a22a4
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Tue Feb 4 12:33:06 2020 +0400
fix issues after review
---
.../panels/MergeLinkedAccountsSearchPanel.java | 1 +
.../client/console/panels/UserDirectoryPanel.java | 33 +++++++++++-----------
.../any/MergeLinkedAccountsWizardBuilder.java | 4 +--
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/MergeLinkedAccountsSearchPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/MergeLinkedAccountsSearchPanel.java
index 2e6ad05..5364312 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/MergeLinkedAccountsSearchPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/MergeLinkedAccountsSearchPanel.java
@@ -98,6 +98,7 @@ public class MergeLinkedAccountsSearchPanel extends WizardStep implements ICondi
} else if (event.getPayload() instanceof AnySelectionDirectoryPanel.ItemSelection) {
AnySelectionDirectoryPanel.ItemSelection payload =
(AnySelectionDirectoryPanel.ItemSelection) event.getPayload();
+
final AnyTO sel = payload.getSelection();
this.wizardModel.setMergingUser(new UserRestClient().read(sel.getKey()));
}
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
index 2fe2e6a..290fbcb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
@@ -344,22 +344,23 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient
String.format("%s,%s,%s", StandardEntitlement.USER_READ, StandardEntitlement.USER_UPDATE,
StandardEntitlement.RESOURCE_GET_CONNOBJECT));
- panel.add(new ActionLink<UserTO>() {
- private static final long serialVersionUID = 8011039414597736111L;
-
- @Override
- public void onClick(final AjaxRequestTarget target, final UserTO ignore) {
- model.setObject(UserRestClient.class.cast(restClient).read(model.getObject().getKey()));
- MergeLinkedAccountsWizardBuilder builder =
- new MergeLinkedAccountsWizardBuilder(model, pageRef, UserDirectoryPanel.this, modal);
- builder.setEventSink(builder);
- target.add(modal.setContent(builder.build(BaseModal.CONTENT_ID, AjaxWizard.Mode.CREATE)));
- modal.header(new StringResourceModel("mergeLinkedAccounts.title", model));
- modal.show(true);
- }
- }, ActionType.MERGE_ACCOUNTS,
- String.format("%s,%s,%s", StandardEntitlement.USER_READ, StandardEntitlement.USER_UPDATE,
- StandardEntitlement.RESOURCE_GET_CONNOBJECT));
+ if (wizardInModal) {
+ panel.add(new ActionLink<UserTO>() {
+ private static final long serialVersionUID = 8011039414597736111L;
+
+ @Override
+ public void onClick(final AjaxRequestTarget target, final UserTO ignore) {
+ model.setObject(UserRestClient.class.cast(restClient).read(model.getObject().getKey()));
+ MergeLinkedAccountsWizardBuilder builder =
+ new MergeLinkedAccountsWizardBuilder(model, pageRef, UserDirectoryPanel.this, modal);
+ builder.setEventSink(builder);
+ target.add(modal.setContent(builder.build(BaseModal.CONTENT_ID, AjaxWizard.Mode.CREATE)));
+ modal.header(new StringResourceModel("mergeLinkedAccounts.title", model));
+ modal.show(true);
+ }}, ActionType.MERGE_ACCOUNTS,
+ String.format("%s,%s,%s,%s", StandardEntitlement.USER_READ, StandardEntitlement.USER_UPDATE,
+ StandardEntitlement.USER_DELETE, StandardEntitlement.RESOURCE_GET_CONNOBJECT));
+ }
}
if (wizardInModal) {
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/MergeLinkedAccountsWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/MergeLinkedAccountsWizardBuilder.java
index eff4f6f..b35f29b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/MergeLinkedAccountsWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/MergeLinkedAccountsWizardBuilder.java
@@ -61,12 +61,12 @@ public class MergeLinkedAccountsWizardBuilder extends AjaxWizardBuilder<UserTO>
private final Panel parentPanel;
- private final BaseModal modal;
+ private final BaseModal<?> modal;
private MergeLinkedAccountsWizardModel model;
public MergeLinkedAccountsWizardBuilder(final IModel<UserTO> model, final PageReference pageRef,
- final Panel parentPanel, final BaseModal modal) {
+ final Panel parentPanel, final BaseModal<?> modal) {
super(model.getObject(), pageRef);
this.parentPanel = parentPanel;
this.modal = modal;