You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mt...@apache.org on 2019/12/01 19:16:07 UTC
[ofbiz-framework] 05/05: Fixed: Remove obsolete references to
WorkflowActivity (OFBIZ-11303)
This is an automated email from the ASF dual-hosted git repository.
mthl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit d0f522aeed689d5642d2f497a71692f54afd0e22
Author: Mathieu Lirzin <ma...@nereide.fr>
AuthorDate: Sun Dec 1 19:16:58 2019 +0100
Fixed: Remove obsolete references to WorkflowActivity (OFBIZ-11303)
The workflow component is in attic since 7 years.
---
.../order/groovyScripts/order/OrderView.groovy | 10 ------
applications/order/template/order/Transitions.ftl | 41 ----------------------
2 files changed, 51 deletions(-)
diff --git a/applications/order/groovyScripts/order/OrderView.groovy b/applications/order/groovyScripts/order/OrderView.groovy
index 756a14f..2be8208 100644
--- a/applications/order/groovyScripts/order/OrderView.groovy
+++ b/applications/order/groovyScripts/order/OrderView.groovy
@@ -498,16 +498,6 @@ if (workEffortId && assignPartyId && assignRoleTypeId && fromDate) {
if ("WF_RUNNING".equals(workEffortStatus) || "WF_SUSPENDED".equals(workEffortStatus))
context.inProcess = true
}
-
- if (workEffort) {
- if ("true".equals(delegate) || "WF_RUNNING".equals(workEffortStatus)) {
- activity = from("WorkflowActivity").where("packageId", workEffort.workflowPackageId, "packageVersion", workEffort.workflowPackageVersion, "processId", workEffort.workflowProcessId, "processVersion", workEffort.workflowProcessVersion, "activityId", workEffort.workflowActivityId).queryOne()
- if (activity) {
- transitions = activity.getRelated("FromWorkflowTransition", null, ["-transitionId"], false)
- context.wfTransitions = transitions
- }
- }
- }
}
}
diff --git a/applications/order/template/order/Transitions.ftl b/applications/order/template/order/Transitions.ftl
index f5e8b72..23317fc 100644
--- a/applications/order/template/order/Transitions.ftl
+++ b/applications/order/template/order/Transitions.ftl
@@ -64,44 +64,3 @@ under the License.
</div>
</#if>
<br />
-<#if wfTransitions?? && wfTransitions?has_content>
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <ul>
- <li class="h3">${uiLabelMap.OrderProcessingTransitions}</li>
- </ul>
- <br class="clear"/>
- </div>
- <div class="screenlet-body">
- <table class="basic-table" cellspacing='0'>
- <tr>
- <td>
- <form action="<@o...@ofbizUrl>" method="post" name="transitionForm">
- <input type="hidden" name="workEffortId" value="${workEffortId}" />
- <input type="hidden" name="partyId" value="${assignPartyId}" />
- <input type="hidden" name="roleTypeId" value="${assignRoleTypeId}" />
- <input type="hidden" name="fromDate" value="${fromDate}" />
- <table class="basic-table" cellspacing='0'>
- <tr>
- <td>
- <select name="approvalCode">
- <#list wfTransitions as trans>
- <#if trans.extendedAttributes?has_content>
- <#assign attrs = Static["org.apache.ofbiz.base.util.StringUtil"].strToMap(trans.extendedAttributes)>
- <#if attrs.approvalCode??>
- <option value="${attrs.approvalCode}">${trans.transitionName}</option>
- </#if>
- </#if>
- </#list>
- </select>
- </td>
- <td valign="center">
- <a href="javascript:document.transitionForm.submit()" class="buttontext">${uiLabelMap.CommonContinue}</a>
- </td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- </table>
-</#if>
\ No newline at end of file