[MMBASE SCM] r42245 - in CMSContainer/trunk/CMSContainer_Modules/rssfeed/src: java/com/finalist/cmsc/rssfeed webapp/editors/config/rssfeed

[jruijter]

Author: jruijter
Date: 2010-05-20 16:34:41 +0200 (Thu, 20 May 2010)
New Revision: 42245

Modified:
   
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationRenderer.java
   
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/webapp/editors/config/rssfeed/edit_rssfeed.xml
Log:
CMSC-1687 custom link field

Modified: 
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationRenderer.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationRenderer.java
   2010-05-20 13:53:59 UTC (rev 42244)
+++ 
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationRenderer.java
   2010-05-20 14:34:41 UTC (rev 42245)
@@ -10,6 +10,7 @@
 
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.mmbase.bridge.*;
@@ -46,12 +47,17 @@
       if (item instanceof RssFeed) {
          RssFeed rssFeed = (RssFeed) item;
 
+         String rssLink = rssFeed.getLink();
+         if (StringUtils.isEmpty(rssLink)) {
+             rssLink = getSiteUrl(request, rssFeed);
+         }         
+         
          Document doc = XmlUtil.createDocument();
          Element rss = XmlUtil.createRoot(doc, "rss");
          XmlUtil.createAttribute(rss, "version", "2.0");
          Element channel = XmlUtil.createChild(rss, "channel");
-         XmlUtil.createChildText(channel, "title", rssFeed.getTitle());
-         XmlUtil.createChildText(channel, "link", getSiteUrl(request, 
rssFeed));
+         XmlUtil.createChildText(channel, "title", rssFeed.getTitle());        
 
+         XmlUtil.createChildText(channel, "link", rssLink);
          XmlUtil.createChildText(channel, "language", rssFeed.getLanguage());
          XmlUtil.createChildText(channel, "description", 
rssFeed.getDescription());
          XmlUtil.createChildText(channel, "copyright", rssFeed.getCopyright());

Modified: 
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/webapp/editors/config/rssfeed/edit_rssfeed.xml
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/webapp/editors/config/rssfeed/edit_rssfeed.xml
  2010-05-20 13:53:59 UTC (rev 42244)
+++ 
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/webapp/editors/config/rssfeed/edit_rssfeed.xml
  2010-05-20 14:34:41 UTC (rev 42245)
@@ -16,6 +16,10 @@
       <prompt xml:lang="nl">URL-fragment</prompt>
       <prompt xml:lang="zh">URL-片段</prompt>
    </field>
+   <field name="link" dtpattern="\://" dtmaxlength="255">   
+      <prompt xml:lang="en">Link</prompt>
+      <prompt xml:lang="nl">Link</prompt>
+   </field>   
    <field name="maximum" dtrequired="true">
       <prompt xml:lang="en">Maximum (amount)</prompt>
       <prompt xml:lang="nl">Maximum (aantal)</prompt>

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs