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

- AWC-1047: Exception when trying to checkout whilst starting workflow

Browse Source 
- Fixed layout issue in manage task dialog

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2007-02-02 11:16:26 +00:00
parent b879308954
commit 0aacdf3ee3
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,6 +200,16 @@
<action idref="remove_package_item" /> <action idref="remove_package_item" />
</action-group> </action-group>
<action-group id="start_package_item_actions">
<action idref="view_content_properties" />
<action idref="edit_content_properties" />
<action idref="edit_doc_http" />
<action idref="edit_doc_webdav" />
<action idref="edit_doc_cifs" />
<action idref="update_doc" />
<action idref="remove_package_item" />
</action-group>
<action-group id="edit_and_remove_package_item_actions"> <action-group id="edit_and_remove_package_item_actions">
<action idref="view_content_properties" /> <action idref="view_content_properties" />
<action idref="edit_content_properties" /> <action idref="edit_content_properties" />

3
source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
View File

@@ -484,7 +484,8 @@ public class CheckinCheckoutBean
// if this is a workflow action and there is a task id present we need // if this is a workflow action and there is a task id present we need
// to also link the working copy to the workflow package so it appears // to also link the working copy to the workflow package so it appears
// in the resources panel in the manage task dialog // in the resources panel in the manage task dialog
if (this.isWorkflowAction && this.workflowTaskId != null) if (this.isWorkflowAction && this.workflowTaskId != null &&
(this.workflowTaskId.equals("null") == false))
{ {
WorkflowTask task = this.workflowService.getTaskById(this.workflowTaskId); WorkflowTask task = this.workflowService.getTaskById(this.workflowTaskId);
if (task != null) if (task != null)

6
source/web/jsp/workflow/manage-task-dialog.jsp
View File

@@ -38,7 +38,7 @@
var="taskProps" columns="1" externalConfig="true" /> var="taskProps" columns="1" externalConfig="true" />
</a:panel> </a:panel>
<h:outputText id="padding1" styleClass="paddingRow" value="&nbsp;" escape="false" /> <h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="resources-panel" label="#{msg.resources}" <a:panel id="resources-panel" label="#{msg.resources}"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle"> border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
@@ -129,7 +129,7 @@
</a:panel> </a:panel>
<h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" /> <h:outputText id="padding3" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}" <a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle"> border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
@@ -138,7 +138,7 @@
</a:panel> </a:panel>
<h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" /> <h:outputText id="padding4" styleClass="paddingRow" value="&nbsp;" escape="false" />
<a:panel rendered="false" id="workflow-outline" label="#{msg.workflow_outline}" progressive="true" expanded="false" <a:panel rendered="false" id="workflow-outline" label="#{msg.workflow_outline}" progressive="true" expanded="false"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle"> border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">