[MMBASE CVS] contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets PortletSelectPortlet.java ContentChannelPortlet.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
In directory 
james.mmbase.org:/tmp/cvs-serv32001/cmsc/portlets/src/java/com/finalist/cmsc/portlets

Modified Files:
      Tag: b1_4
        PortletSelectPortlet.java ContentChannelPortlet.java 
Log Message:
CMSC-617 Personal Pages module
Backport to 1.4


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-617


Index: PortletSelectPortlet.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/PortletSelectPortlet.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- PortletSelectPortlet.java   26 Nov 2007 11:43:40 -0000      1.6
+++ PortletSelectPortlet.java   25 Feb 2008 16:25:45 -0000      1.6.2.1
@@ -83,9 +83,7 @@
       String layoutId = (String) 
req.getAttribute(PortalConstants.CMSC_OM_PORTLET_LAYOUTID);
 
       List<PortletDefinition> portlets = 
SiteManagement.getSingletonPortlets(pageId, layoutId);
-      ;
       List<PortletDefinition> portletdefinitions = 
SiteManagement.getPortletDefintions(pageId, layoutId);
-      ;
 
       Map<PortletDefinition, List<View>> defViews = new 
HashMap<PortletDefinition, List<View>>();
       for (PortletDefinition definition : portletdefinitions) {


Index: ContentChannelPortlet.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- ContentChannelPortlet.java  26 Nov 2007 11:43:40 -0000      1.10
+++ ContentChannelPortlet.java  25 Feb 2008 16:25:45 -0000      1.10.2.1
@@ -103,7 +103,7 @@
 
       String channel = preferences.getValue(CONTENTCHANNEL, null);
       if (!StringUtil.isEmpty(channel)) {
-         addContentElements(req);
+         addContentElements(req, channel);
          super.doView(req, res);
       }
    }
@@ -113,9 +113,9 @@
    protected void doEdit(RenderRequest req, RenderResponse res) throws 
PortletException, IOException {
       String elementId = req.getParameter(ELEMENT_ID);
       if (StringUtil.isEmpty(elementId)) {
-         addContentElements(req);
          PortletPreferences preferences = req.getPreferences();
          String channel = preferences.getValue(CONTENTCHANNEL, null);
+         addContentElements(req, channel);
          if (!StringUtil.isEmpty(channel)) {
             if (ContentRepository.mayEdit(channel)) {
                super.doEdit(req, res);
@@ -131,15 +131,13 @@
    }
 
 
-   protected void addContentElements(RenderRequest req) {
+   protected void addContentElements(RenderRequest req, String channel) {
       String elementId = req.getParameter(ELEMENT_ID);
       if (StringUtil.isEmpty(elementId)) {
          PortletPreferences preferences = req.getPreferences();
          String portletId = 
preferences.getValue(PortalConstants.CMSC_OM_PORTLET_ID, null);
          List<String> contenttypes = SiteManagement.getContentTypes(portletId);
 
-         String channel = preferences.getValue(CONTENTCHANNEL, null);
-
          int offset = 0;
          String currentOffset = req.getParameter(OFFSET);
          if (!StringUtil.isEmpty(currentOffset)) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs