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 2017/04/21 11:04:35 UTC
[1/6] syncope git commit: Incorrect parameter passing
Repository: syncope
Updated Branches:
refs/heads/2_0_X bbbd0295d -> 2381d0a35
refs/heads/master 51ae1d5ef -> 160293666
Incorrect parameter passing
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1bfa4f4e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1bfa4f4e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1bfa4f4e
Branch: refs/heads/2_0_X
Commit: 1bfa4f4e10d2374b852dfc08b5f211724e189f23
Parents: bbbd029
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Apr 21 12:15:55 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Apr 21 12:15:55 2017 +0200
----------------------------------------------------------------------
.../META-INF/resources/app/js/controllers/UserController.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/1bfa4f4e/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
index fbee936..3bf3468 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
@@ -69,13 +69,13 @@ angular.module("self").controller("UserController", ['$scope', '$rootScope', '$l
* if you want to sort with custom JS function defined in put also a sorting function as last parameter
* e.g. $rootScope.attributesSorting.ASC
*/
- schemaService = SchemaService.getTypeExtSchemas(group, $rootScope.customForm);
+ schemaService = SchemaService.getTypeExtSchemas(group);
} else {
/*
* if you want to sort with custom JS function defined in put also a sorting function as last parameter
* e.g. $rootScope.attributesSorting.ASC
*/
- schemaService = SchemaService.getUserSchemas(anyTypeClass, $rootScope.customForm);
+ schemaService = SchemaService.getUserSchemas(anyTypeClass);
}
schemaService.then(function (schemas) {
if (group && (schemas.plainSchemas.length > 0 || schemas.derSchemas.length > 0 || schemas.virSchemas.length > 0))
[4/6] syncope git commit: Incorrect parameter passing
Posted by il...@apache.org.
Incorrect parameter passing
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/813b0ab1
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/813b0ab1
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/813b0ab1
Branch: refs/heads/master
Commit: 813b0ab17dd4525c255d29c41b8b82dfafb8b010
Parents: 51ae1d5
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Apr 21 12:15:55 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Apr 21 13:04:18 2017 +0200
----------------------------------------------------------------------
.../META-INF/resources/app/js/controllers/UserController.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/813b0ab1/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
index fbee936..3bf3468 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
@@ -69,13 +69,13 @@ angular.module("self").controller("UserController", ['$scope', '$rootScope', '$l
* if you want to sort with custom JS function defined in put also a sorting function as last parameter
* e.g. $rootScope.attributesSorting.ASC
*/
- schemaService = SchemaService.getTypeExtSchemas(group, $rootScope.customForm);
+ schemaService = SchemaService.getTypeExtSchemas(group);
} else {
/*
* if you want to sort with custom JS function defined in put also a sorting function as last parameter
* e.g. $rootScope.attributesSorting.ASC
*/
- schemaService = SchemaService.getUserSchemas(anyTypeClass, $rootScope.customForm);
+ schemaService = SchemaService.getUserSchemas(anyTypeClass);
}
schemaService.then(function (schemas) {
if (group && (schemas.plainSchemas.length > 0 || schemas.derSchemas.length > 0 || schemas.virSchemas.length > 0))
[6/6] syncope git commit: [SYNCOPE-1070] Using the actual schema type
to get the value as string
Posted by il...@apache.org.
[SYNCOPE-1070] Using the actual schema type to get the value as string
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/16029366
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/16029366
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/16029366
Branch: refs/heads/master
Commit: 16029366613c0534ea77828bec02c7cd607fb223
Parents: 84ad937
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Apr 21 13:04:02 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Apr 21 13:04:25 2017 +0200
----------------------------------------------------------------------
.../apache/syncope/core/provisioning/java/MappingManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/16029366/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
index 7e5e9a8..6b5e588 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
@@ -258,7 +258,7 @@ public class MappingManagerImpl implements MappingManager {
if (FrameworkUtil.isSupportedAttributeType(schemaType.getType())) {
objValues.add(value.getValue());
} else {
- objValues.add(value.getValueAsString());
+ objValues.add(value.getValueAsString(schemaType));
}
}
[2/6] syncope git commit: Better error management in case of missing
workflow definition
Posted by il...@apache.org.
Better error management in case of missing workflow definition
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4659fd3d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4659fd3d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4659fd3d
Branch: refs/heads/2_0_X
Commit: 4659fd3d5d3474bfc939a618bbb1f84dc1fe7c3f
Parents: 1bfa4f4
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Apr 21 12:40:41 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Apr 21 12:40:41 2017 +0200
----------------------------------------------------------------------
.../client/console/resources/AbstractWorkflowResource.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4659fd3d/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java b/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
index 2998644..85a2cbc 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.resources;
+import javax.ws.rs.NotFoundException;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.syncope.client.console.commons.Constants;
@@ -48,6 +49,9 @@ abstract class AbstractWorkflowResource extends AbstractResource {
return modelId.toString().equals(object.getModelId());
}
});
+ if (workflowDefinition == null) {
+ throw new NotFoundException("Workflow definition with modelId " + modelId);
+ }
return workflowDefinition;
}
[5/6] syncope git commit: Better error management in case of missing
workflow definition
Posted by il...@apache.org.
Better error management in case of missing workflow definition
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/84ad9371
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/84ad9371
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/84ad9371
Branch: refs/heads/master
Commit: 84ad9371bb9784a1aa5387009981ecf80125f69a
Parents: 813b0ab
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Apr 21 12:40:41 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Apr 21 13:04:21 2017 +0200
----------------------------------------------------------------------
.../client/console/resources/AbstractWorkflowResource.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/84ad9371/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java b/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
index 2998644..85a2cbc 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/AbstractWorkflowResource.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.resources;
+import javax.ws.rs.NotFoundException;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.syncope.client.console.commons.Constants;
@@ -48,6 +49,9 @@ abstract class AbstractWorkflowResource extends AbstractResource {
return modelId.toString().equals(object.getModelId());
}
});
+ if (workflowDefinition == null) {
+ throw new NotFoundException("Workflow definition with modelId " + modelId);
+ }
return workflowDefinition;
}
[3/6] syncope git commit: [SYNCOPE-1070] Using the actual schema type
to get the value as string
Posted by il...@apache.org.
[SYNCOPE-1070] Using the actual schema type to get the value as string
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2381d0a3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2381d0a3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2381d0a3
Branch: refs/heads/2_0_X
Commit: 2381d0a358515befac417c50dd18bac20173d538
Parents: 4659fd3
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Apr 21 13:04:02 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Apr 21 13:04:02 2017 +0200
----------------------------------------------------------------------
.../apache/syncope/core/provisioning/java/MappingManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2381d0a3/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
index 7e5e9a8..6b5e588 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
@@ -258,7 +258,7 @@ public class MappingManagerImpl implements MappingManager {
if (FrameworkUtil.isSupportedAttributeType(schemaType.getType())) {
objValues.add(value.getValue());
} else {
- objValues.add(value.getValueAsString());
+ objValues.add(value.getValueAsString(schemaType));
}
}