[gatein-commits] gatein SVN: r1019 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
Author: liem_nguyen
Date: 2009-12-15 23:05:10 -0500 (Tue, 15 Dec 2009)
New Revision: 1019
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java
Log:
GTNPORTAL-350 Still show group id is current portal name when check permission of page
(node) is created by Create page function in portal navigation
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java
===================================================================
---
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2009-12-16
02:25:51 UTC (rev 1018)
+++
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2009-12-16
04:05:10 UTC (rev 1019)
@@ -27,7 +27,9 @@
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.PageNavigation;
import org.exoplatform.portal.config.model.PageNode;
+import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
+import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.web.application.ApplicationMessage;
@@ -376,8 +378,16 @@
String[] accessPermission = new String[1];
accessPermission[0] = "*:" + ownerId;
String editPermission = userACL.getMakableMT() + ":" + ownerId;
+
+ if (PortalConfig.PORTAL_TYPE.equals(uiForm.getOwnerType()))
+ {
+ UIPortal uiPortal = Util.getUIPortal();
+ accessPermission = uiPortal.getAccessPermissions();
+ editPermission = uiPortal.getEditPermission();
+ }
+
+
UIFormStringInput uiPageName = uiInputSet.getChildById("pageName");
-
UIFormStringInput uiPageTitle = uiInputSet.getChildById("pageTitle");
Page page = new Page();