inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-1156 / ALF-1628 - Correctly build the Share URL from SysAdminParams for the Wiki RSS feed links

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-09-13 19:40:07 +00:00
parent be10705b88
commit 65747ff791
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl
View File

@@ -8,14 +8,14 @@
<generator>Alfresco ${server.edition} v${server.version}</generator> <generator>Alfresco ${server.edition} v${server.version}</generator>
<image> <image>
<title>Alfresco - Wiki Page Recent Changes</title> <title>Alfresco - Wiki Page Recent Changes</title>
<url>${absurl(url.context)?replace("alfresco", "share/proxy/alfresco")}/images/logo/AlfrescoLogo200.png</url> <url>${shareUrl}/proxy/alfresco/images/logo/AlfrescoLogo200.png</url>
</image> </image>
<#list wiki.pages?sort_by(['modified'])?reverse as p> <#list wiki.pages?sort_by(['modified'])?reverse as p>
<#assign node = p.node> <#assign node = p.node>
<#assign page = p.page> <#assign page = p.page>
<item> <item>
<title>${(page.title!"")?html}</title> <title>${(page.title!"")?html}</title>
<link>${absurl(url.context)?replace("alfresco", "share/page/site/${siteId}/wiki-page?title=${page.systemName}")}</link> <link>${shareUrl}/page/site/${siteId}/wiki-page?title=${page.systemName}</link>
<pubDate>${page.modifiedAt?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate> <pubDate>${page.modifiedAt?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate>
<guid isPermaLink="false">${node.id}</guid> <guid isPermaLink="false">${node.id}</guid>
</item> </item>

1
config/alfresco/web-scripts-application-context.xml
View File

@@ -1608,6 +1608,7 @@
<bean id="webscript.org.alfresco.slingshot.wiki.pagelist.get" <bean id="webscript.org.alfresco.slingshot.wiki.pagelist.get"
class="org.alfresco.repo.web.scripts.wiki.WikiPageListGet" class="org.alfresco.repo.web.scripts.wiki.WikiPageListGet"
parent="abstractWikiWebScript"> parent="abstractWikiWebScript">
<property name="sysAdminParams" ref="sysAdminParams" />
</bean> </bean>

12
source/java/org/alfresco/repo/web/scripts/wiki/WikiPageListGet.java
View File

@@ -26,11 +26,14 @@ import java.util.Map;
import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults; import org.alfresco.query.PagingResults;
import org.alfresco.repo.admin.SysAdminParams;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.wiki.WikiServiceImpl; import org.alfresco.repo.wiki.WikiServiceImpl;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.TemplateService;
import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.wiki.WikiPageInfo; import org.alfresco.service.cmr.wiki.WikiPageInfo;
import org.alfresco.util.UrlUtil;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
@@ -47,6 +50,14 @@ public class WikiPageListGet extends AbstractWikiWebScript
protected static final int RECENT_SEARCH_PERIOD_DAYS = 7; protected static final int RECENT_SEARCH_PERIOD_DAYS = 7;
protected static final long ONE_DAY_MS = 24*60*60*1000; protected static final long ONE_DAY_MS = 24*60*60*1000;
// Injected services
private SysAdminParams sysAdminParams;
public void setSysAdminParams(SysAdminParams sysAdminParams)
{
this.sysAdminParams = sysAdminParams;
}
@Override @Override
protected Map<String, Object> executeImpl(SiteInfo site, String pageName, protected Map<String, Object> executeImpl(SiteInfo site, String pageName,
WebScriptRequest req, JSONObject json, Status status, Cache cache) WebScriptRequest req, JSONObject json, Status status, Cache cache)
@@ -166,6 +177,7 @@ public class WikiPageListGet extends AbstractWikiWebScript
model.put("wiki", wiki); model.put("wiki", wiki);
model.put("siteId", site.getShortName()); model.put("siteId", site.getShortName());
model.put("site", site); model.put("site", site);
model.put(TemplateService.KEY_SHARE_URL, UrlUtil.getShareUrl(sysAdminParams));
return model; return model;
} }
} }