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:26 UTC
[syncope] branch master updated (671eadc -> eb8a5c9)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 671eadc Avoid to alter font files
new 6e347c4 Missing annotation for JSON data type
new eb8a5c9 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] 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 master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 6e347c4dea3f905921060799195e8debec282928
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
[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 master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit eb8a5c9b3b4c5030f050043549148945eeb66d39
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/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>() {