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 V3.2 to HEAD

Browse Source 
18207: Merged DEV/TEMPORARY to V3.2
      17887: ETHREEOH-3853: FF 3.0: Exception after double click on 'Add button'.
      18068: ETHREEOH-3623: Script Error on page "Web Form Details"
      18097: ETHREEOH-3826: System Error occurs on "More Actions" page for a Space after "Edit Details" page for the same Space has been previously opened
      18168: ETHREEOH-3789: Rule with simple workflow moves document to incorrect space
   18238: Fix for ETHREEOH-4000 - WebScript extensions readme.ftl template fixed.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2010-01-26 12:33:55 +00:00
parent 7d57899506
commit 8ec990c703
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
config/alfresco/templates/readme.ftl
View File

@@ -1,32 +1,22 @@
<#-- Displays the contents of readme.html and/or the evaluated readme.ftl if they exist in the current space. --> <#-- Displays the contents of readme.html and/or the evaluated readme.ftl if they exist in the current space. -->
<#-- Old template
<#assign htmlFilename = "readme.html"/>
<#assign ftlFilename = "readme.ftl"/>
<#if space?exists>
<#if space.childByNamePath["${htmlFilename}"]?exists>
${space.childByNamePath[htmlFilename].content}
</#if>
<#if space.childByNamePath["${ftlFilename}"]?exists>
<#include space.childByNamePath["${ftlFilename}"].nodeRef>
</#if>
</#if>
-->
<#assign filename = "readme"/> <#assign filename = "readme"/>
<#assign htmlExt = "html"/> <#assign htmlExt = "html"/>
<#assign suffix = .lang /> <#assign suffix = .lang />
<#assign ftlExt = "ftl"/> <#assign ftlExt = "ftl"/>
<#assign htmlFilename = "${filename}_${suffix}.${htmlExt}"/> <#assign htmlLangFilename = "${filename}_${suffix}.${htmlExt}"/>
<#assign htmlFilename = "${filename}.${htmlExt}"/>
<#assign ftlFilename = "${filename}.${ftlExt}"/> <#assign ftlFilename = "${filename}.${ftlExt}"/>
<#assign messageError="File ${htmlFilename} does not exist!"/> <#assign messageError="Readme file does not exist!"/>
<#assign found = false>
<#if space?exists> <#if space?exists>
<#if space.childByNamePath["${htmlFilename}"]?exists> <#if space.childByNamePath["${htmlLangFilename}"]?exists>
${space.childByNamePath[htmlLangFilename].content}
<#elseif space.childByNamePath["${htmlFilename}"]?exists>
${space.childByNamePath[htmlFilename].content} ${space.childByNamePath[htmlFilename].content}
<#elseif space.childByNamePath["${ftlFilename}"]?exists>
<#include space.childByNamePath["${ftlFilename}"].nodeRef>
<#else> <#else>
${messageError} ${messageError}
</#if> </#if>
<#if space.childByNamePath["${ftlFilename}"]?exists>
<#include space.childByNamePath["${ftlFilename}"].nodeRef>
</#if>
</#if> </#if>

2
source/java/org/alfresco/repo/action/evaluator/compare/TextPropertyValueComparator.java
View File

@@ -73,7 +73,7 @@ public class TextPropertyValueComparator implements PropertyValueComparator
{ {
// Remove the star and set the operation to startsWith // Remove the star and set the operation to startsWith
operation = ComparePropertyValueOperation.BEGINS; operation = ComparePropertyValueOperation.BEGINS;
compareText = compareText.substring(0, (compareText.length()-2)); compareText = compareText.substring(0, (compareText.length()-1));
} }
else else
{ {