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
commit eb8a5c9b3b4c5030f050043549148945eeb66d39 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Thu May 20 11:56:33 2021 +0200 Fixing Encrypted Plain Schema transparent encryption settings in Console --- .../apache/syncope/client/console/panels/PlainSchemaDetails.java | 1 - .../org/apache/syncope/client/console/panels/SchemaTypePanel.java | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java index 6b677ad..83bbcb6 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java @@ -374,7 +374,6 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { mimeType.setChoices(null); } else if (AttrSchemaType.Encrypted.ordinal() == typeOrdinal) { conversionParams.setVisible(false); - conversionPattern.setModelObject(null); enumParams.setVisible(false); if (enumerationValuesPanel.isRequired()) { diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java index ac93457..3d4e283 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java @@ -151,15 +151,15 @@ public class SchemaTypePanel extends TypesDirectoryPanel<SchemaTO, SchemaProvide @Override public ActionsPanel<SchemaTO> getActions(final IModel<SchemaTO> model) { - final ActionsPanel<SchemaTO> panel = super.getActions(model); + ActionsPanel<SchemaTO> panel = super.getActions(model); panel.add(new ActionLink<SchemaTO>() { private static final long serialVersionUID = -3722207913631435501L; @Override public void onClick(final AjaxRequestTarget target, final SchemaTO ignore) { - send(SchemaTypePanel.this, Broadcast.EXACT, - new AjaxWizard.EditItemActionEvent<>(model.getObject(), target)); + send(SchemaTypePanel.this, Broadcast.EXACT, new AjaxWizard.EditItemActionEvent<>( + SchemaRestClient.read(schemaType, model.getObject().getKey()), target)); } }, ActionLink.ActionType.EDIT, IdRepoEntitlement.SCHEMA_UPDATE); panel.add(new ActionLink<SchemaTO>() {
