[gatein-commits] gatein SVN: r3086 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
Author: kien_nguyen
Date: 2010-05-14 00:02:24 -0400 (Fri, 14 May 2010)
New Revision: 3086
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
GTNPORTAL-1072 Show protected content when edit page in special case(check permission for
loading portlet)
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
---
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-05-14
00:36:47 UTC (rev 3085)
+++
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-05-14
04:02:24 UTC (rev 3086)
@@ -26,6 +26,7 @@
import org.exoplatform.portal.portlet.PortletExceptionHandleService;
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.util.Util;
+import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.resolver.ApplicationResourceResolver;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -196,7 +197,9 @@
else
{
int portalMode = Util.getUIPortalApplication().getModeState();
- if (portalMode % 2 == 0 ||
uicomponent.getCurrentPortletMode().equals(PortletMode.EDIT))
+
+ //Check mode of portal, portlet and permission for viewable
+ if ((portalMode % 2 == 0 ||
uicomponent.getCurrentPortletMode().equals(PortletMode.EDIT)) &&
uicomponent.hasPermission())
{
PortletInvocationResponse response =
uicomponent.invoke(renderInvocation);
if (response instanceof FragmentResponse)