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 2013/02/11 17:26:31 UTC
svn commit: r1444850 - in /syncope/branches/1_0_X:
console/src/main/resources/org/apache/syncope/console/pages/
core/src/main/java/org/apache/syncope/core/workflow/
core/src/main/java/org/apache/syncope/core/workflow/activiti/
core/src/main/resources/
Author: ilgrosso
Date: Mon Feb 11 16:26:31 2013
New Revision: 1444850
URL: http://svn.apache.org/r1444850
Log:
[SYNCOPE-308] Default workflow changed to raise exception when update of rejected user is attempted
Modified:
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java
syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html?rev=1444850&r1=1444849&r2=1444850&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html (original)
+++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html Mon Feb 11 16:26:31 2013
@@ -12,26 +12,6 @@
limitations under the License.
under the License.
-->
-<wicket:head>
- <style type="text/css">
- /* SET THE DEFAULT ERROR PANEL'S' STYLE, INVALIDATING THE CSS RENDERING
- FOR THE CURRENT PAGE */
- .feedbackPanelERROR {
- background: none !important;
- font-weight: normal;
- color: red;
- border:0 none !important;
- list-style-type: disc;
- padding: 5px;
- margin: 5px;
- }
-
- .feedbackPanelERROR span {
- padding: 0px;
- margin: 0px;
- }
- </style>
-</wicket:head>
<wicket:extend>
<div id="tabs">
<ul>
Modified: syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java?rev=1444850&r1=1444849&r2=1444850&view=diff
==============================================================================
--- syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java (original)
+++ syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java Mon Feb 11 16:26:31 2013
@@ -269,7 +269,7 @@ public class ActivitiUserWorkflowAdapter
}
if (StringUtils.isBlank(user.getWorkflowId())) {
- throw new WorkflowException(new NotFoundException("Empty workflow id"));
+ throw new WorkflowException(new NotFoundException("Empty workflow id for " + user));
}
List<Task> tasks = taskService.createTaskQuery().processInstanceId(user.getWorkflowId()).list();
Modified: syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java?rev=1444850&r1=1444849&r2=1444850&view=diff
==============================================================================
--- syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java (original)
+++ syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java Mon Feb 11 16:26:31 2013
@@ -34,7 +34,6 @@ public class Delete extends AbstractActi
user.checkToken("");
}
-
// remove SyncopeUser variable
execution.removeVariable(ActivitiUserWorkflowAdapter.SYNCOPE_USER);
}
Modified: syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml?rev=1444850&r1=1444849&r2=1444850&view=diff
==============================================================================
--- syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml (original)
+++ syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml Mon Feb 11 16:26:31 2013
@@ -164,8 +164,13 @@ under the License.
<userTask id="rejected" name="Rejected"/>
- <sequenceFlow id="flow14" sourceRef="rejected" targetRef="delete"/>
-
+ <sequenceFlow id="flow14" sourceRef="rejected" targetRef="rejectedGw"/>
+
+ <exclusiveGateway id="rejectedGw"/>
+ <sequenceFlow id="rejected2Delete" sourceRef="rejectedGw" targetRef="delete">
+ <conditionExpression xsi:type="tFormalExpression">${task == 'delete'}</conditionExpression>
+ </sequenceFlow>
+
<!-- Delete an user (created, active or suspended) -->
<serviceTask id="delete" name="Delete" activiti:class="org.apache.syncope.core.workflow.activiti.Delete"/>