inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Expired content job now uses a query to find expired items rather than crawling all nodes

Browse Source 
- 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
This commit is contained in:
Gavin Cornwell
2007-05-30 12:08:36 +00:00
parent 73ae2265eb
commit 1222d8b93a
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/alfresco/web-client-config-properties.xml
View File

@@ -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>

9
config/alfresco/web-client-config-workflow-actions.xml
View File

@@ -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>

2
source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
View File

@@ -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));