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

[do-not-reply at jboss.org]

Author: truong.le
Date: 2009-12-01 21:24:04 -0500 (Tue, 01 Dec 2009)
New Revision: 896

Modified:
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
Log:
GTNPORTAL-327: Show portal name is null when edit portal properties

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-12-01 15:40:52 UTC (rev 895)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java	2009-12-02 02:24:04 UTC (rev 896)
@@ -281,12 +281,18 @@
 
       public void execute(Event<UIPortalComposer> event) throws Exception
       {
-         UIPortal uiPortal = Util.getUIPortal();
+         UIComponent temp = null;
+         UIPortal uiPortal = null;
+         UIEditInlineWorkspace uiEditWS = event.getSource().getAncestorOfType(UIEditInlineWorkspace.class);
+         temp = uiEditWS.getUIComponent();
+         if(temp != null && (temp instanceof UIPortal)) 
+            uiPortal = (UIPortal)temp;
+         else
+            uiPortal = Util.getUIPortal();
          UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class);
-
          UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
-         UIPortalForm portalForm = uiMaskWS.createUIComponent(UIPortalForm.class, null, "UIPortalForm");
-         portalForm.setPortalOwner(uiPortal.getOwner());
+         UIPortalForm portalForm = uiMaskWS.createUIComponent(UIPortalForm.class, null, "UIPortalForm");         
+         portalForm.setPortalOwner(uiPortal.getOwner());            
          portalForm.setBindingBean();
          if(PortalConfig.USER_TYPE.equals(uiPortal.getOwnerType())){
             portalForm.removeChildById("PermissionSetting");
@@ -337,7 +343,7 @@
          if (uri == null)
          {
             uri = (uiPortal.getSelectedNode() != null) ? uiPortal.getSelectedNode().getUri() : null;
-         }
+         }         
          PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri);
          uiPortal.broadcast(pnevent, Event.Phase.PROCESS);
          prContext.addUIComponentToUpdateByAjax(uiWorkingWS);