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

Merged V2.1 to HEAD

Browse Source 
6447: Office Add-Ins: Files which missed CHK-1041
   6448: Fix for WCM-692 (bug in parsing of port number in filesystem deployment)
   6449: Office Webscripts: Fix for typo when getting task resource nodes
   6450: Fix for WCM-707 (content launch section is shown when there is no workflow defined)
   6451: Removed unused AVM hooks in content stream listener
   6452: Bootstrap processes killed on VM shutdown.
   6453: Fix for WCM-720 - actions in Task Dialog were no longer available after lock checking added to client ui evaluators.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 22:18:29 +00:00
parent 97b5b391c8
commit d0beb33499
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
View File

@@ -1,6 +1,6 @@
<#assign doc_actions="${url.serviceContext}/office/docActions"> <#assign doc_actions="${url.serviceContext}/office/docActions">
<#if args.p?exists><#assign path=args.p><#else><#assign path=""></#if> <#if args.p?exists><#assign path=args.p><#else><#assign path=""></#if>
<#if args.e?exists><#assign extn=args.e><#else><#assign extn="doc"></#if> <#if args.e?exists><#assign extn=args.e><#else><#assign extn="doc"></#if><#assign extnx=extn+"x">
<#if args.n?exists><#assign nav=args.n><#else><#assign nav=""></#if> <#if args.n?exists><#assign nav=args.n><#else><#assign nav=""></#if>
<#if docWorkflow?exists> <#if docWorkflow?exists>
<#assign d=docWorkflow> <#assign d=docWorkflow>
@@ -82,7 +82,7 @@
</#if> </#if>
</div> </div>
<div class="header">Workflow</div> <div class="header">Task Details</div>
<div class="containerBig"> <div class="containerBig">
<div id="nonStatusText"> <div id="nonStatusText">

2
config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
View File

@@ -45,7 +45,7 @@
<#list task.packageResources as res> <#list task.packageResources as res>
<tr> <tr>
<#if res.isDocument> <#if res.isDocument>
<#if child.name?ends_with(extn) || child.name?ends_with(extnx)> <#if res.name?ends_with(extn) || res.name?ends_with(extnx)>
<#assign relativePath = (res.displayPath?substring(companyhome.name?length+1) + '/' + res.name)?url?replace('%2F', '/')?replace('\'', '\\\'') /> <#assign relativePath = (res.displayPath?substring(companyhome.name?length+1) + '/' + res.name)?url?replace('%2F', '/')?replace('\'', '\\\'') />
<td width="16"><a href="${url.context}${res.url}" target="new"><img src="${url.context}${res.icon16}" alt="${res.name}"></a></td> <td width="16"><a href="${url.context}${res.url}" target="new"><img src="${url.context}${res.icon16}" alt="${res.name}"></a></td>
<td> <td>

10
source/java/org/alfresco/web/action/evaluator/WCMWorkflowEvaluator.java
View File

@@ -46,20 +46,20 @@ public class WCMWorkflowEvaluator extends WCMLockEvaluator
*/ */
public boolean evaluate(final Node node) public boolean evaluate(final Node node)
{ {
final Pair<Integer, String> p = AVMNodeConverter.ToAVMVersionPath(node.getNodeRef());
final String path = p.getSecond();
boolean proceed = false; boolean proceed = false;
if (super.evaluate(node)) if (AVMUtil.isWorkflowStore(AVMUtil.getStoreName(path)) || super.evaluate(node))
{ {
final FacesContext facesContext = FacesContext.getCurrentInstance(); final FacesContext facesContext = FacesContext.getCurrentInstance();
final AVMService avmService = Repository.getServiceRegistry(facesContext).getAVMService(); final AVMService avmService = Repository.getServiceRegistry(facesContext).getAVMService();
final Pair<Integer, String> p = AVMNodeConverter.ToAVMVersionPath(node.getNodeRef());
final int version = p.getFirst();
final String path = p.getSecond();
// evaluate to true if we are not deleted and within a workflow store (i.e. list of resources // evaluate to true if we are not deleted and within a workflow store (i.e. list of resources
// in the task dialog) or not part of an already in-progress workflow // in the task dialog) or not part of an already in-progress workflow
proceed = ((AVMUtil.isWorkflowStore(AVMUtil.getStoreName(path)) || proceed = ((AVMUtil.isWorkflowStore(AVMUtil.getStoreName(path)) ||
!((AVMNode)node).isWorkflowInFlight()) && !((AVMNode)node).isWorkflowInFlight()) &&
avmService.lookup(version, path) != null); avmService.lookup(p.getFirst(), path) != null);
} }
return proceed; return proceed;
} }

4
source/web/jsp/wcm/submit-dialog.jsp
View File

@@ -124,12 +124,12 @@
</h:panelGrid> </h:panelGrid>
<h:panelGrid columns="1" cellpadding="2" style="padding-top:6px;padding-bottom:4px;" <h:panelGrid columns="1" cellpadding="2" style="padding-top:6px;padding-bottom:4px;"
width="100%" rowClasses="wizardSectionHeading"> width="100%" rowClasses="wizardSectionHeading" rendered="#{DialogManager.bean.workflowListSize != 0}">
<h:outputText value="&nbsp;#{msg.content_launch}" escape="false" /> <h:outputText value="&nbsp;#{msg.content_launch}" escape="false" />
</h:panelGrid> </h:panelGrid>
<h:panelGrid columns="2" cellpadding="2" cellpadding="2" width="100%" style="margin-left:8px" <h:panelGrid columns="2" cellpadding="2" cellpadding="2" width="100%" style="margin-left:8px"
columnClasses="noBrColumn,rightHandColumn"> columnClasses="noBrColumn,rightHandColumn" rendered="#{DialogManager.bean.workflowListSize != 0}">
<h:outputText value="#{msg.launch_date}:"/> <h:outputText value="#{msg.launch_date}:"/>
<a:inputDatePicker id="launch-date" value="#{DialogManager.bean.launchDate}" <a:inputDatePicker id="launch-date" value="#{DialogManager.bean.launchDate}"
initialiseIfNull="false" style="margin-right: 7px;" showTime="true" /> initialiseIfNull="false" style="margin-right: 7px;" showTime="true" />