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 2019/09/11 10:14:19 UTC
[syncope] branch master updated: [SYNCOPE-1478] Now allowing to
reset uidOnCreate to null
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
The following commit(s) were added to refs/heads/master by this push:
new 3d9fa58 [SYNCOPE-1478] Now allowing to reset uidOnCreate to null
3d9fa58 is described below
commit 3d9fa5874a30a947d22f91bd897c908f2d9f71a2
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Sep 11 12:13:52 2019 +0200
[SYNCOPE-1478] Now allowing to reset uidOnCreate to null
---
.../syncope/client/console/panels/ProvisionAuxClassesPanel.java | 3 +--
.../core/provisioning/java/data/ResourceDataBinderImpl.java | 7 +++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ProvisionAuxClassesPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ProvisionAuxClassesPanel.java
index 6d6e3a9..2a03b9e 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ProvisionAuxClassesPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ProvisionAuxClassesPanel.java
@@ -99,8 +99,7 @@ public class ProvisionAuxClassesPanel extends Panel {
"uidOnCreate", new ResourceModel("uidOnCreate", "uidOnCreate").getObject(),
new PropertyModel<>(provision, "uidOnCreate"));
uidOnCreate.setChoices(getSchemas(anyType, model.getObject()));
- uidOnCreate.setOutputMarkupId(true).
- setEnabled(provision != null);
+ uidOnCreate.setOutputMarkupId(true).setEnabled(provision != null);
addOrReplace(uidOnCreate);
}
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
index 87c2570..8013795 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
@@ -205,10 +205,13 @@ public class ResourceDataBinderImpl implements ResourceDataBinder {
provision.setIgnoreCaseMatch(provisionTO.isIgnoreCaseMatch());
- if (StringUtils.isNotBlank(provisionTO.getUidOnCreate())) {
+ if (StringUtils.isBlank(provisionTO.getUidOnCreate())) {
+ provision.setUidOnCreate(null);
+ } else {
PlainSchema uidOnCreate = plainSchemaDAO.find(provisionTO.getUidOnCreate());
if (uidOnCreate == null) {
- LOG.warn("Ignoring invalid schema for uidOnCreate(): {}", provisionTO.getUidOnCreate());
+ LOG.warn("Ignoring invalid schema for uidOnCreate: {}", provisionTO.getUidOnCreate());
+ provision.setUidOnCreate(null);
} else {
provision.setUidOnCreate(uidOnCreate);
}