Merge with master

yipai · Jun 17, 2013 · 1d3572b · 1d3572b
2 parents 85f6ecd + f316ea2
commit 1d3572b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...ctiviti-explorer/src/main/java/org/activiti/explorer/ui/task/HistoricTaskDetailPanel.java b/...ctiviti-explorer/src/main/java/org/activiti/explorer/ui/task/HistoricTaskDetailPanel.java
@@ -12,6 +12,7 @@
  */
 package org.activiti.explorer.ui.task;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.activiti.engine.HistoryService;
@@ -308,7 +309,13 @@ protected void initRelatedContent() {
     addComponent(relatedContentLayout);
     initRelatedContentTitle();
 
-    List<Attachment> attachments = taskService.getTaskAttachments(historicTask.getId());
+    List<Attachment> attachments = new ArrayList<Attachment>();
+    attachments.addAll(taskService.getTaskAttachments(historicTask.getId()));
+    if (historicTask.getProcessInstanceId() != null) {
+      System.out.println("BIEP : " + taskService.getProcessInstanceAttachments(historicTask.getProcessInstanceId()).size());
+      attachments.addAll(taskService.getProcessInstanceAttachments(historicTask.getProcessInstanceId()));
+    }
+
     if (attachments.size() > 0) {
       Table table = initRelatedContentTable();
       populateRelatedContent(table, attachments);

diff --git a/modules/activiti-ldap/src/test/java/org/activiti/test/ldap/LdapIntegrationTest.java b/modules/activiti-ldap/src/test/java/org/activiti/test/ldap/LdapIntegrationTest.java
@@ -30,7 +30,7 @@ public void testAuthenticationThroughLdap() {
   public void testCandidateGroupFetchedThroughLdap() {
     runtimeService.startProcessInstanceByKey("testCandidateGroup");
     assertEquals(1, taskService.createTaskQuery().count());
-    assertEquals(1, taskService.createTaskQuery().taskCandidateGroup("Sales").count());
+    assertEquals(1, taskService.createTaskQuery().taskCandidateGroup("sales").count());
 
     // Pepe is a member of the candidate group and should be able to find the task
     assertEquals(1, taskService.createTaskQuery().taskCandidateUser("pepe").count());

diff --git a/...rg/activiti/test/ldap/LdapIntegrationTest.testCandidateGroupFetchedThroughLdap.bpmn20.xml b/...rg/activiti/test/ldap/LdapIntegrationTest.testCandidateGroupFetchedThroughLdap.bpmn20.xml
@@ -13,7 +13,7 @@
 		<userTask id="theTask">
 		  <potentialOwner>
 		    <resourceAssignmentExpression>
-		      <formalExpression>user(kermit), group(Sales)</formalExpression>
+		      <formalExpression>user(kermit), group(sales)</formalExpression>
 		    </resourceAssignmentExpression>
 		  </potentialOwner>
 		</userTask>