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 2021/05/20 09:59:31 UTC
[syncope] branch 2_1_X updated (d051420 -> 4d8b71a)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from d051420 Supporting YAML in BinaryTextPreviewer
new b11e712 Missing annotation for JSON data type
new 4d8b71a Fixing Encrypted Plain Schema transparent encryption settings in Console
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/syncope/client/console/panels/PlainSchemaDetails.java | 1 -
.../org/apache/syncope/client/console/panels/SchemaTypePanel.java | 6 +++---
.../core/persistence/jpa/entity/anyobject/JPAJSONAnyObject.java | 2 ++
3 files changed, 5 insertions(+), 4 deletions(-)
[syncope] 02/02: Fixing Encrypted Plain Schema transparent
encryption settings in Console
Posted by il...@apache.org.
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ò <il...@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>() {
[syncope] 01/02: Missing annotation for JSON data type
Posted by il...@apache.org.
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 b11e712e9ca7a3911bf98d82b5d4dcaf67e9315c
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 20 10:55:38 2021 +0200
Missing annotation for JSON data type
---
.../syncope/core/persistence/jpa/entity/anyobject/JPAJSONAnyObject.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAJSONAnyObject.java b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAJSONAnyObject.java
index 841e613..6b09c7d 100644
--- a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAJSONAnyObject.java
+++ b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/entity/anyobject/JPAJSONAnyObject.java
@@ -25,6 +25,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
+import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
import org.apache.syncope.core.persistence.api.entity.Membership;
@@ -43,6 +44,7 @@ public class JPAJSONAnyObject extends JPAAnyObject implements JSONAttributable<A
private static final long serialVersionUID = -8543654943709531885L;
+ @Lob
private String plainAttrs;
@Transient