[gatein-commits] gatein SVN: r397 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.

[do-not-reply at jboss.org]

Author: tam_nguyen
Date: 2009-10-22 05:52:00 -0400 (Thu, 22 Oct 2009)
New Revision: 397

Modified:
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
Log:
PORTAL-3635 Always keep the old permission of the portal has changed

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java	2009-10-22 08:53:58 UTC (rev 396)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java	2009-10-22 09:52:00 UTC (rev 397)
@@ -147,7 +147,7 @@
 
       PortalConfig portalConfig = (PortalConfig)PortalDataMapper.buildModelObject(editPortal);
       UserPortalConfigService configService = getApplicationComponent(UserPortalConfigService.class);
-      configService.update(portalConfig);
+      //configService.update(portalConfig);
       uiPortalApp.getUserPortalConfig().setPortal(portalConfig);
       String remoteUser = prContext.getRemoteUser();
       String ownerUser = prContext.getPortalOwner();

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java	2009-10-22 08:53:58 UTC (rev 396)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java	2009-10-22 09:52:00 UTC (rev 397)
@@ -27,6 +27,7 @@
 import org.exoplatform.portal.config.model.PortalConfig;
 import org.exoplatform.portal.config.model.PortalProperties;
 import org.exoplatform.portal.skin.SkinService;
+import org.exoplatform.portal.webui.util.PortalDataMapper;
 import org.exoplatform.portal.webui.util.Util;
 import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
 import org.exoplatform.portal.webui.workspace.UIPortalApplication;
@@ -236,6 +237,9 @@
          UIPortal uiPortal = Util.getUIPortal();
          uiForm.invokeSetBindingBean(uiPortal);
          //      uiPortal.refreshNavigation(localeConfigService.getLocaleConfig(uiPortal.getLocale()).getLocale()) ;
+         PortalConfig portalConfig = (PortalConfig)PortalDataMapper.buildModelObject(uiPortal);
+         UserPortalConfigService configService = uiForm.getApplicationComponent(UserPortalConfigService.class);
+         configService.update(portalConfig);
          UIMaskWorkspace uiMaskWorkspace = uiForm.getParent();
          uiMaskWorkspace.setUIComponent(null);
          event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace);