Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory james.mmbase.org:/tmp/cvs-serv22587
Modified Files:
NewsletterContentPortlet.java
Log Message:
CMSC-811,Create a newsletter publication,adding default term, move from
NewsletterPublicationCreate to Newslettercreate
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-811
Index: NewsletterContentPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterContentPortlet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterContentPortlet.java 5 May 2008 10:26:59 -0000 1.19
+++ NewsletterContentPortlet.java 6 May 2008 06:04:15 -0000 1.20
@@ -20,6 +20,7 @@
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.portlets.AbstractContentPortlet;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
+import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.newsletter.util.NewsletterUtil;
public class NewsletterContentPortlet extends AbstractContentPortlet {
@@ -59,6 +60,11 @@
NavigationItem result =
SiteManagement.getNavigationItemFromPath(currentPath);
if (result != null) {
int itemNumber = result.getId();
+ if(!NewsletterUtil.isNewsletter(itemNumber)) {
+ if(NewsletterUtil.isNewsletterPublication(itemNumber)) {
+ itemNumber =
NewsletterPublicationUtil.getNewsletterByPublicationNumber(itemNumber).getNumber();
+ }
+ }
addContentElements(request,itemNumber);
}
else {
@@ -107,12 +113,15 @@
int totalItems = 0 ;
List<ContentElement> elements = null;
String termNumbers = req.getParameter(NEWSLETTER_TERMS_PARAM);
+
System.out.println("------------------>"+termNumbers+"-----itemNumber--"+itemNumber);
if(StringUtils.isEmpty(termNumbers)) {
totalItems = NewsletterUtil.countArticlesByNewsletter(itemNumber);
+ System.out.println("-------------111----->"+totalItems);
elements =
NewsletterUtil.getArticlesByNewsletter(itemNumber,offset,elementsPerPage,orderBy,direction);
}
else {
totalItems = NewsletterUtil.countArticlesByNewsletter(termNumbers);
+ System.out.println("-------------222----->"+totalItems);
elements =
NewsletterUtil.getArticlesByNewsletter(termNumbers,offset,elementsPerPage,orderBy,direction);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
