Author: smilek
Date: Wed Feb 21 13:05:21 2007
New Revision: 510209
URL: http://svn.apache.org/viewvc?view=rev&rev=510209
Log:
added 'editorType' init-param, which if set to 'desktop' will cause the
/desktop customizer to be used when edit-page action occurs from /portal
Modified:
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/portlet.xml
Modified:
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java?view=diff&rev=510209&r1=510208&r2=510209
==============================================================================
---
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
(original)
+++
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
Wed Feb 21 13:05:21 2007
@@ -37,6 +37,7 @@
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.decoration.DecorationFactory;
import org.apache.jetspeed.decoration.PageEditAccess;
+import org.apache.jetspeed.desktop.JetspeedDesktop;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.ContentPage;
@@ -63,13 +64,16 @@
private String columnSizes = null;
private String portletName = null;
private String layoutType;
+ private String editorType = null;
protected DecorationFactory decorators;
+ protected JetspeedDesktop desktop;
public void init( PortletConfig config ) throws PortletException
{
super.init(config);
this.portletName = config.getPortletName();
this.layoutType = config.getInitParameter("layoutType");
+ this.editorType = config.getInitParameter("editorType");
if (this.layoutType == null)
{
throw new PortletException("Layout type not specified for " +
this.portletName);
@@ -99,7 +103,9 @@
if (null == this.decorators)
{
throw new PortletException("Failed to find the Decoration Factory
on portlet initialization");
- }
+ }
+
+ this.desktop =
(JetspeedDesktop)getPortletContext().getAttribute(CommonPortletServices.CPS_DESKTOP);
}
public void doView( RenderRequest request, RenderResponse response )
throws PortletException, IOException
@@ -125,7 +131,7 @@
super.doView(request, response);
return;
}
-
+
// get fragment column sizes
Fragment f = getFragment(request, false);
String fragmentColumnSizes = columnSizes;
@@ -190,7 +196,16 @@
}
else if ( "edit".equals(pageMode) &&
pageEditAccess.isEditAllowed() )
{
- pageEditAccess.setEditing(true);
+ if ( this.editorType != null && this.editorType.equals(
"desktop" ) )
+ {
+ String redirectUrl = this.desktop.getPortalUrl(
requestContext, requestContext.getPath() );
+ redirectUrl += "?editPage=true&portal=true";
+ response.sendRedirect( redirectUrl );
+ }
+ else
+ {
+ pageEditAccess.setEditing(true);
+ }
}
return;
}
Modified:
portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml?view=diff&rev=510209&r1=510208&r2=510209
==============================================================================
---
portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
(original)
+++
portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
Wed Feb 21 13:05:21 2007
@@ -35,7 +35,9 @@
<js:service name='Powertools'/>
<js:service name='DecorationFactory'/>
<js:service name='EntityAccessor'/>
- <js:service name='WindowAccessor'/>
+ <js:service name='WindowAccessor'/>
+ <js:service name='WindowAccessor'/>
+ <js:service name='Desktop'/>
</js:services>
-</portlet-app>
\ No newline at end of file
+</portlet-app>
Modified:
portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/portlet.xml?view=diff&rev=510209&r1=510208&r2=510209
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/portlet.xml
(original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/webapp/WEB-INF/portlet.xml Wed
Feb 21 13:05:21 2007
@@ -150,6 +150,10 @@
<name>layoutType</name>
<value>TwoColumns</value>
</init-param>
+ <!-- <init-param>
+ <name>editorType</name>
+ <value>desktop</value>
+ </init-param> -->
<portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
<resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
<expiration-cache>0</expiration-cache>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
