[syncope] 02/02: Fixing Encrypted Plain Schema transparent encryption settings in Console

[ilgrosso]

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

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 4d8b71a6e97e43012992a809f26a732666f8deb3
Author: Francesco Chicchiriccò <ilgro...@apache.org>
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/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
index c873d40..166f2a4 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java
+++ 
b/client/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/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
index 9b28988..6c3c17f 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
@@ -161,15 +161,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<>(
+                        restClient.read(schemaType, 
model.getObject().getKey()), target));
             }
         }, ActionLink.ActionType.EDIT, StandardEntitlement.SCHEMA_UPDATE);
         panel.add(new ActionLink<SchemaTO>() {