Merged V3.1 to HEAD

12951: ETHREEOH-1010 - IE window was not closed when we click "Save Changes" button on "Manage Task" page(Office Add-in)
   13029: ALFCOM-2475 - DocList RSS feed migrated to web tier

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2009-03-10 16:01:56 +00:00
parent 0de5f20930
commit fe77dcbe7f
2 changed files with 9 additions and 45 deletions

View File

@@ -79,23 +79,23 @@
"path": "${item.location.path!""}",
"file": "${item.location.file!""}"
},
"permissions":
{
"inherited": ${d.inheritsPermissions?string},
"roles":
[
"permissions":
{
"inherited": ${d.inheritsPermissions?string},
"roles":
[
<#list d.permissions as permission>
"${permission?string}"<#if permission_has_next>,</#if>
</#list>
],
"userAccess":
{
"userAccess":
{
"create": ${d.hasPermission("CreateChildren")?string},
"edit": ${d.hasPermission("Write")?string},
"delete": ${d.hasPermission("Delete")?string},
"permissions": ${d.hasPermission("ChangePermissions")?string}
}
}
}
}
}<#if item_has_next>,</#if>
</#list>
]

View File

@@ -1,36 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<channel rdf:about="http://www.alfresco.com/">
<title>Alfresco - Documents</title>
<link>${absurl(url.context)}/</link>
<description>Alfresco Document List</description>
<lastBuildDate>${xmldate(date)}</lastBuildDate>
<pubDate>${xmldate(date)}</pubDate>
<generator>Alfresco ${server.edition} v${server.version}</generator>
<#assign linkprefix=absurl(url.context)?replace("alfresco", "share/proxy/alfresco-feed")>
<image>
<title>Alfresco - Documents</title>
<url>${linkprefix}/images/logo/AlfrescoLogo200.png</url>
</image>
<#list doclist.items as item>
<#assign d = item.asset>
<#if d.isDocument>
<#assign isImage=(d.mimetype="image/gif" || d.mimetype="image/jpeg" || d.mimetype="image/png")>
<#assign isMP3=(d.mimetype="audio/x-mpeg" || d.mimetype="audio/mpeg")>
<item>
<title>${d.name?html}</title>
<link>${linkprefix}/api/node/content/${d.storeType}/${d.storeId}/${d.id}/${d.name?url}</link>
<#if isMP3>
<enclosure url="api/node/content/${d.storeType}/${d.storeId}/${d.id}/${d.name?url}" length="${d.size?string?replace(",","")}" type="audio/mpeg"/>
</#if>
<description>
<#if isImage || true>&lt;img src=&quot;${linkprefix}/api/node/content/${d.storeType}/${d.storeId}/${d.id}/${d.name?url}&quot;&gt;&lt;br/&gt;</#if>
<#if d.properties.description?exists>${d.properties.description?html}</#if>
</description>
<pubDate>${xmldate(d.properties.modified)}</pubDate>
<guid isPermaLink="false">${d.id}</guid>
</item>
</#if>
</#list>
</channel>
</rss>