Fixed link to main page on wiki filter component. Wiki markup is now rendered correctly on wiki page listing. Fixed null title in link to renamed page.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Simon Buckle
2008-07-30 10:56:42 +00:00
parent 6079c6fdfb
commit abc20e4b06
2 changed files with 3 additions and 3 deletions

View File

@@ -53,7 +53,7 @@ function main()
link.save(); link.save();
**/ **/
var placeholder = createWikiPage(currentName, wiki, { var placeholder = createWikiPage(currentName, wiki, {
content: "This page has been moved [[" + args.name + "|here]]." content: "This page has been moved [[" + newName + "|here]]."
}); });
var d = { var d = {

View File

@@ -7,8 +7,8 @@
"name" : "${page.name}", "name" : "${page.name}",
"editable" : "<#if page.hasPermission("Write")>true<#else>false</#if>", "editable" : "<#if page.hasPermission("Write")>true<#else>false</#if>",
"title" : "<#if page.properties.title?exists>${page.properties.title}<#else>${page.name?replace("_", " ")}</#if>", "title" : "<#if page.properties.title?exists>${page.properties.title}<#else>${page.name?replace("_", " ")}</#if>",
<#-- strip out any html tags and/or wiki markup --> <#-- strip out any html tags -->
"text" : "${page.content?replace("</?[^>]+>", " ", "ir")?replace("\\[\\[(?:[a-zA-Z\\s]+\\|)?([^\\]]+)\\]\\]", "$1", "ir")?j_string}", "text" : "${page.content?replace("</?[^>]+>", " ", "ir")}",
"createdOn": "${page.properties.created?string("MMM dd yyyy, HH:mm:ss")}", "createdOn": "${page.properties.created?string("MMM dd yyyy, HH:mm:ss")}",
"createdBy": "${page.properties.creator}", "createdBy": "${page.properties.creator}",
"modifiedOn": "${page.properties.modified?string("MMM dd yyyy, HH:mm:ss")}", "modifiedOn": "${page.properties.modified?string("MMM dd yyyy, HH:mm:ss")}",