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

Fix for AWC-1879

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8338 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-02-20 14:22:43 +00:00
parent 5d93614733
commit 9c2cebed23
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/web-client-config-dialogs.xml
View File

@@ -430,11 +430,11 @@
icon="/images/icons/preview_large.gif" title-id="apply_template"
description-id="apply_dashboard_info" />
<dialog name="editSimpleWorkflow" page="/jsp/content/edit-simple-workflow.jsp" managed-bean="EditSimpleWorkflowDialog"
<dialog name="editContentSimpleWorkflow" page="/jsp/content/edit-simple-workflow.jsp" managed-bean="EditContentSimpleWorkflowDialog"
icon="/images/icons/edit_large.gif" title-id="modify_workflow_props"
description-id="editworkflow_description" />
<dialog name="editSpaceSimpleWorkflow" page="/jsp/spaces/edit-simple-workflow.jsp" managed-bean="EditSimpleWorkflowDialog"
<dialog name="editSpaceSimpleWorkflow" page="/jsp/spaces/edit-simple-workflow.jsp" managed-bean="EditSpaceSimpleWorkflowDialog"
icon="/images/icons/edit_large.gif" title-id="modify_workflow_props"
description-id="editworkflow_description" />

8
source/web/WEB-INF/faces-config-beans.xml
View File

@@ -5018,8 +5018,8 @@
</managed-bean>
<managed-bean>
<description>The bean for Edit Simple Workflow Screen.</description>
<managed-bean-name>EditSimpleWorkflowDialog</managed-bean-name>
<description>The bean for content Edit Simple Workflow Screen.</description>
<managed-bean-name>EditContentSimpleWorkflowDialog</managed-bean-name>
<managed-bean-class>
org.alfresco.web.bean.content.EditSimpleWorkflowDialog
</managed-bean-class>
@@ -5035,8 +5035,8 @@
</managed-bean>
<managed-bean>
<description>The bean for Edit Simple Space Workflow Screen.</description>
<managed-bean-name>EditSimpleWorkflowDialog</managed-bean-name>
<description>The bean for space Edit Simple Space Workflow Screen.</description>
<managed-bean-name>EditSpaceSimpleWorkflowDialog</managed-bean-name>
<managed-bean-class>
org.alfresco.web.bean.spaces.EditSimpleWorkflowDialog
</managed-bean-class>

4
source/web/jsp/content/document-details.jsp
View File

@@ -266,13 +266,13 @@
<h:panelGroup id="workflow-panel-facets">
<f:facet name="title">
<r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write">
<a:actionLink id="titleLink2" value="#{msg.title_edit_simple_workflow}" showLink="false" image="/images/icons/Change_details.gif" action="dialog:editSimpleWorkflow" rendered="#{DialogManager.bean.approveStepName != null}" />
<a:actionLink id="titleLink2" value="#{msg.title_edit_simple_workflow}" showLink="false" image="/images/icons/Change_details.gif" action="dialog:editContentSimpleWorkflow" rendered="#{DialogManager.bean.approveStepName != null}" />
</r:permissionEvaluator>
</f:facet>
</h:panelGroup>
<a:panel label="#{msg.workflows}" id="workflow-panel" facetsId="dialog:dialog-body:workflow-panel-facets" progressive="true" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white"
expanded='#{DialogManager.bean.panels["workflow-panel"]}' expandedActionListener="#{DialogManager.bean.expandPanel}">
<r:nodeWorkflowInfo id="workflow-info" value="#{EditSimpleWorkflowDialog.document}" />
<r:nodeWorkflowInfo id="workflow-info" value="#{DialogManager.bean.document}" />
</a:panel>
<f:verbatim>

12
source/web/jsp/content/edit-simple-workflow.jsp
View File

@@ -76,7 +76,7 @@
<tr>
<td><nobr></f:verbatim><h:outputText value="#{msg.name_approve_step}" /><f:verbatim>:</nobr></td>
<td width="90%"></f:verbatim><h:inputText id="approve-step-name"
value="#{EditSimpleWorkflowDialog.workflowProperties.approveStepName}"
value="#{DialogManager.bean.workflowProperties.approveStepName}"
onkeyup="javascript:checkButtonState();" /><f:verbatim></td>
</tr>
<tr>
@@ -90,7 +90,7 @@
<table cellpadding="2" cellspacing="2" border="0">
<tr>
<td valign="top"></f:verbatim><h:selectOneRadio
value="#{EditSimpleWorkflowDialog.workflowProperties.approveAction}">
value="#{DialogManager.bean.workflowProperties.approveAction}">
<f:selectItem itemValue="move" itemLabel="Move" />
<f:selectItem itemValue="copy" itemLabel="Copy" />
</h:selectOneRadio><f:verbatim></td>
@@ -101,7 +101,7 @@
<td style="padding-top:6px;"></f:verbatim><r:ajaxFolderSelector
id="clientApproveFolder"
label="#{msg.select_destination_prompt}"
value="#{EditSimpleWorkflowDialog.workflowProperties.approveFolder}"
value="#{DialogManager.bean.workflowProperties.approveFolder}"
initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
styleClass="selector" /><f:verbatim></td>
</tr>
@@ -120,7 +120,7 @@
</tr>
<tr>
<td></f:verbatim><h:selectOneRadio id="reject-step-present"
value="#{EditSimpleWorkflowDialog.workflowProperties.rejectStepPresent}"
value="#{DialogManager.bean.workflowProperties.rejectStepPresent}"
onclick="javascript:checkButtonState();">
<f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
<f:selectItem itemValue="no" itemLabel="#{msg.no}" />
@@ -137,7 +137,7 @@
<td><nobr> </f:verbatim><h:outputText
value="#{msg.name_reject_step}" /><f:verbatim>:&nbsp; </f:verbatim><h:inputText
id="reject-step-name"
value="#{EditSimpleWorkflowDialog.workflowProperties.rejectStepName}"
value="#{DialogManager.bean.workflowProperties.rejectStepName}"
onkeyup="javascript:checkButtonState();" /><f:verbatim> </nobr></td>
</tr>
<tr>
@@ -161,7 +161,7 @@
<td style="padding-top:6px;"></f:verbatim><r:ajaxFolderSelector
id="clientRejectFolder"
label="#{msg.select_destination_prompt}"
value="#{EditSimpleWorkflowDialog.workflowProperties.rejectFolder}"
value="#{DialogManager.bean.workflowProperties.rejectFolder}"
initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
styleClass="selector" /><f:verbatim></td>
</tr>

14
source/web/jsp/spaces/edit-simple-workflow.jsp
View File

@@ -80,7 +80,7 @@
<tr>
<td><nobr></f:verbatim><h:outputText value="#{msg.name_approve_step}" /><f:verbatim>:</nobr></td>
<td width="90%"></f:verbatim><h:inputText id="approve-step-name"
value="#{EditSimpleWorkflowDialog.workflowProperties.approveStepName}"
value="#{DialogManager.bean.workflowProperties.approveStepName}"
onkeyup="javascript:checkButtonState();" /><f:verbatim></td>
</tr>
<tr>
@@ -94,7 +94,7 @@
<table cellpadding="2" cellspacing="2" border="0">
<tr>
<td valign="top"></f:verbatim><h:selectOneRadio
value="#{EditSimpleWorkflowDialog.workflowProperties.approveAction}">
value="#{DialogManager.bean.workflowProperties.approveAction}">
<f:selectItem itemValue="move" itemLabel="Move" />
<f:selectItem itemValue="copy" itemLabel="Copy" />
</h:selectOneRadio><f:verbatim></td>
@@ -105,7 +105,7 @@
<td style="padding-top:6px;"></f:verbatim><r:ajaxFolderSelector
id="clientApproveFolder"
label="#{msg.select_destination_prompt}"
value="#{EditSimpleWorkflowDialog.workflowProperties.approveFolder}"
value="#{DialogManager.bean.workflowProperties.approveFolder}"
initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
styleClass="selector" /><f:verbatim></td>
</tr>
@@ -124,7 +124,7 @@
</tr>
<tr>
<td></f:verbatim><h:selectOneRadio id="reject-step-present"
value="#{EditSimpleWorkflowDialog.workflowProperties.rejectStepPresent}"
value="#{DialogManager.bean.workflowProperties.rejectStepPresent}"
onclick="javascript:checkButtonState();">
<f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
<f:selectItem itemValue="no" itemLabel="#{msg.no}" />
@@ -141,7 +141,7 @@
<td><nobr> </f:verbatim><h:outputText
value="#{msg.name_reject_step}" /><f:verbatim>:&nbsp; </f:verbatim><h:inputText
id="reject-step-name"
value="#{EditSimpleWorkflowDialog.workflowProperties.rejectStepName}"
value="#{DialogManager.bean.workflowProperties.rejectStepName}"
onkeyup="javascript:checkButtonState();" /><f:verbatim> </nobr></td>
</tr>
<tr>
@@ -154,7 +154,7 @@
<table cellpadding="2" cellspacing="2" border="0">
<tr>
<td valign="top"></f:verbatim><h:selectOneRadio
value="#{EditSimpleWorkflowDialog.workflowProperties.rejectAction}">
value="#{DialogManager.bean.workflowProperties.rejectAction}">
<f:selectItem itemValue="move" itemLabel="#{msg.move}" />
<f:selectItem itemValue="copy" itemLabel="#{msg.copy}" />
</h:selectOneRadio><f:verbatim></td>
@@ -165,7 +165,7 @@
<td style="padding-top:6px;"></f:verbatim><r:ajaxFolderSelector
id="clientRejectFolder"
label="#{msg.select_destination_prompt}"
value="#{EditSimpleWorkflowDialog.workflowProperties.rejectFolder}"
value="#{DialogManager.bean.workflowProperties.rejectFolder}"
initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
styleClass="selector" /><f:verbatim></td>
</tr>