From 1222d8b93a98832e423dfa7cb21fe88c4d7d45e8 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Wed, 30 May 2007 12:08:36 +0000
Subject: [PATCH] - Expired content job now uses a query to find expired items
 rather than crawling all nodes - Fixed bug when handling expired items
 submitted by users removed from web project - Re-applied config for comments
 in manage task dialogs - Re-applied config for expired items actions -
 Removed fix width for comment column in workflow history

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/web-client-config-properties.xml     | 12 ++++++++++++
 .../alfresco/web-client-config-workflow-actions.xml  |  9 +++++++++
 .../web/ui/repo/component/UIWorkflowHistory.java     |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/web-client-config-properties.xml b/config/alfresco/web-client-config-properties.xml
index cc0cbc72f9..3a8c66584d 100644
--- a/config/alfresco/web-client-config-properties.xml
+++ b/config/alfresco/web-client-config-properties.xml
@@ -316,6 +316,7 @@
          <show-property name="bpm:dueDate" read-only="true" />
          <show-property name="bpm:priority" read-only="true" />
          <show-property name="bpm:status" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
       </property-sheet>
    </config>
 
@@ -327,6 +328,7 @@
          <show-property name="bpm:dueDate" read-only="true" />
          <show-property name="bpm:priority" read-only="true" />
          <show-property name="bpm:status" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
          <separator name="sep2" display-label-id="users_and_roles" component-generator="HeaderSeparatorGenerator" />
          <show-association name="bpm:assignee" display-label-id="wf_reviewer" read-only="true" />
       </property-sheet>
@@ -340,6 +342,7 @@
          <show-property name="bpm:dueDate" read-only="true" />
          <show-property name="bpm:priority" read-only="true" />
          <show-property name="bpm:status" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
          <separator name="sep2" display-label-id="users_and_roles" component-generator="HeaderSeparatorGenerator" />
          <show-association name="bpm:assignee" display-label-id="wf_reviewer" read-only="true" />
       </property-sheet>
@@ -366,6 +369,7 @@
          <show-property name="bpm:dueDate" read-only="true" />
          <show-property name="bpm:priority" read-only="true" />
          <show-property name="bpm:status" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
          <separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
          <show-property name="wf:reviewerCount" read-only="true"/>
          <show-property name="wf:requiredPercent" read-only="true"/>
@@ -382,6 +386,7 @@
          <show-property name="bpm:dueDate" read-only="true" />
          <show-property name="bpm:priority" read-only="true" />
          <show-property name="bpm:status" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
          <separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
          <show-property name="wf:reviewerCount" read-only="true"/>
          <show-property name="wf:requiredPercent" read-only="true"/>
@@ -412,6 +417,7 @@
          <show-property name="bpm:dueDate" read-only="true" />
          <show-property name="bpm:priority" read-only="true" />
          <show-property name="bpm:status" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
       </property-sheet>
    </config>
 
@@ -446,6 +452,7 @@
          <show-property name="wcmwf:label" read-only="true" />
          <show-property name="wcmwf:launchDate" read-only="true"/>
          <show-property name="bpm:status" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
          <separator name="sep2" display-label-id="wf_reviewers" component-generator="HeaderSeparatorGenerator" />
          <show-property name="wcmwf:reviewType" read-only="true" />
          <show-association name="bpm:assignees" display-label-id="wf_reviewers" read-only="true"/>
@@ -457,6 +464,7 @@
          <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
          <show-property name="bpm:taskId" />
          <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
          <separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
          <show-property name="wcmwf:reviewType" read-only="true"/>
          <show-association name="bpm:assignees" display-label-id="wf_reviewers" read-only="true"/>
@@ -471,6 +479,7 @@
          <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
          <show-property name="wcmwf:label" read-only="true" />
          <show-property name="wcmwf:launchDate" read-only="true" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
          <separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
          <show-property name="wcmwf:reviewType" read-only="true"/>
          <show-association name="bpm:assignees" display-label-id="wf_reviewers" read-only="true"/>
@@ -485,6 +494,7 @@
          <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
          <show-property name="wcmwf:label" read-only="true" />
          <show-property name="wcmwf:launchDate" read-only="true" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
          <separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
          <show-property name="wcmwf:reviewType" read-only="true"/>
          <show-association name="bpm:assignees" display-label-id="wf_reviewers" read-only="true"/>
@@ -499,6 +509,7 @@
          <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
          <show-property name="wcmwf:label" read-only="true" />
          <show-property name="wcmwf:launchDate" read-only="true" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
          <separator name="sep2" display-label-id="wf_review_status" component-generator="HeaderSeparatorGenerator" />
          <show-property name="wcmwf:reviewType" read-only="true"/>
          <show-association name="bpm:assignees" display-label-id="wf_reviewers" read-only="true"/>
@@ -525,6 +536,7 @@
          <show-property name="bpm:taskId" />
          <show-property name="bpm:description" component-generator="TextAreaGenerator" read-only="true"/>
          <show-property name="bpm:status" />
+         <show-property name="bpm:comment" component-generator="TextAreaGenerator" />
       </property-sheet>
    </config>
 
diff --git a/config/alfresco/web-client-config-workflow-actions.xml b/config/alfresco/web-client-config-workflow-actions.xml
index d924c1a3d4..81ee8ef282 100644
--- a/config/alfresco/web-client-config-workflow-actions.xml
+++ b/config/alfresco/web-client-config-workflow-actions.xml
@@ -293,6 +293,15 @@
             <action idref="remove_package_item" />
          </action-group>
          
+         <action-group id="edit_and_delete_wcm_package_item_actions">
+            <action idref="edit_file"/>
+            <action idref="update_file" />
+            <action idref="workflow_revert" />
+            <action idref="workflow_preview_file" />
+            <action idref="workflow_file_details" />
+            <action idref="delete_file" />
+         </action-group>
+         
          <action-group id="add_package_item_actions">
             <action idref="add_package_item" />
          </action-group>
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
index 08c5181f67..863e60f024 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
@@ -202,7 +202,7 @@ public class UIWorkflowHistory extends SelfRenderingComponent
                out.write(Utils.getDateTimeFormat(context).format(createdDate));
                out.write("</td><td>");
                out.write(owner);
-               out.write("</td><td width='200'>");
+               out.write("</td><td>");
                out.write(comment == null ? "" : comment);
                out.write("</td><td>");
                out.write(Utils.getDateTimeFormat(context).format(completedDate));