Author: hoang_to
Date: 2010-05-19 04:33:11 -0400 (Wed, 19 May 2010)
New Revision: 3124
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
Log:
Rollback the Javacode on navigation edit permission check. For release 3.1, the former
check on PortalConfig is reused. That should be modified right after
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
---
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-05-19
07:47:45 UTC (rev 3123)
+++
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-05-19
08:33:11 UTC (rev 3124)
@@ -336,8 +336,30 @@
DataStorage dataService = uicomp.getApplicationComponent(DataStorage.class);
WebuiRequestContext context = event.getRequestContext();
UIApplication uiApplication = context.getUIApplication();
-
+
+ //Minh Hoang TO: User could edit navigation if he/she has edit permissions on
PortalConfig. That is not
+ //at all logical and should be modified after release 3.1 GA
+ UserPortalConfigService configService =
uicomp.getApplicationComponent(UserPortalConfigService.class);
+ UserPortalConfig userPortalConfig =
configService.getUserPortalConfig(portalName, context.getRemoteUser());
+ if(userPortalConfig == null)
+ {
+ uiApplication.addMessage(new
ApplicationMessage("UISiteManagement.msg.portal-not-exist",
+ new String[]{portalName}));
+ return;
+ }
+
+ UserACL userACL = uicomp.getApplicationComponent(UserACL.class);
+ if (!userACL.hasEditPermission(userPortalConfig.getPortalConfig()))
+ {
+ uiApplication.addMessage(new
ApplicationMessage("UISiteManagement.msg.Invalid-editPermission", null));;
+ return;
+ }
+
PageNavigation edittedNavigation =
dataService.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
+
+
+ //Minh Hoang TO: For release 3.1, Edit Permission check would be rollback to
former checks on PortalConfig
+ /*
if (edittedNavigation == null)
{
uiApplication.addMessage(new
ApplicationMessage("UISiteManagement.msg.portal-not-exist",
@@ -351,7 +373,8 @@
uiApplication.addMessage(new
ApplicationMessage("UISiteManagement.msg.Invalid-editPermission", null));;
return;
}
-
+ */
+
UIPopupWindow popUp = uicomp.getChild(UIPopupWindow.class);
UINavigationManagement naviManager =
popUp.createUIComponent(UINavigationManagement.class, null, null, popUp);
naviManager.setOwner(portalName);
Show replies by date