[gatein-commits] gatein SVN: r406 - in portal/trunk/webui: eXo/src/main/java/org/exoplatform/webui/organization and 1 other directories.

[do-not-reply at jboss.org]

Author: liem_nguyen
Date: 2009-10-22 23:32:18 -0400 (Thu, 22 Oct 2009)
New Revision: 406

Modified:
   portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/UIFormLifecycle.java
   portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java
Log:
GTNPORTAL-54 Cancel button does not work correct in case Form has subComponnent

Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/UIFormLifecycle.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/UIFormLifecycle.java	2009-10-23 03:30:51 UTC (rev 405)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/UIFormLifecycle.java	2009-10-23 03:32:18 UTC (rev 406)
@@ -69,6 +69,8 @@
       }
       UIComponent uiSubComponent = uicomponent.findComponentById(subComponentId);
       Event<UIComponent> event = uiSubComponent.createEvent(action, Event.Phase.DECODE, context);
+      if (event == null)
+        event = uicomponent.createEvent(action, Event.Phase.DECODE, context);
       if (event != null)
          event.broadcast();
    }

Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java	2009-10-23 03:30:51 UTC (rev 405)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java	2009-10-23 03:32:18 UTC (rev 406)
@@ -54,8 +54,7 @@
  *          ha.pham at exoplatform.com
  * May 7, 2007
  */
- at ComponentConfig(template = "system:/groovy/organization/webui/component/UIListPermissionSelector.gtmpl", events = {
-   @EventConfig(phase = Phase.DECODE, listeners = UIListPermissionSelector.CloseActionListener.class),
+ at ComponentConfig(template = "system:/groovy/organization/webui/component/UIListPermissionSelector.gtmpl", events = {   
    @EventConfig(phase = Phase.DECODE, listeners = UIListPermissionSelector.DeleteActionListener.class, confirm = "UIAccessGroup.deleteAccessGroup"),
    @EventConfig(phase = Phase.DECODE, listeners = UIPermissionSelector.SelectMembershipActionListener.class),
    @EventConfig(phase = Phase.DECODE, listeners = UIListPermissionSelector.ChangePublicModeActionListener.class)})
@@ -279,19 +278,6 @@
       }
 
    }
-   
-   static public class CloseActionListener extends EventListener<UIListPermissionSelector>
-   {
-      public void execute(Event<UIListPermissionSelector> event) throws Exception
-      {
-         UIListPermissionSelector uicom = event.getSource();
-         UIForm uiForm = uicom.getAncestorOfType(UIForm.class);         
-         if (uiForm != null)
-         {
-            uiForm.broadcast(event, event.getExecutionPhase());
-         }
-      }
-   }
 
    static public class EmptyIteratorValidator implements Validator
    {

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java	2009-10-23 03:30:51 UTC (rev 405)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMaskWorkspace.java	2009-10-23 03:32:18 UTC (rev 406)
@@ -25,12 +25,14 @@
 import org.exoplatform.webui.core.UIComponentDecorator;
 import org.exoplatform.webui.event.Event;
 import org.exoplatform.webui.event.EventListener;
+import org.exoplatform.webui.event.Event.Phase;
 
 /**
  * Created by The eXo Platform SAS
  * Mar 13, 2007  
  */
- at ComponentConfig(id = "UIMaskWorkspace", template = "system:/groovy/portal/webui/workspace/UIMaskWorkspace.gtmpl", events = @EventConfig(listeners = UIMaskWorkspace.CloseActionListener.class))
+ at ComponentConfig(id = "UIMaskWorkspace", template = "system:/groovy/portal/webui/workspace/UIMaskWorkspace.gtmpl", 
+                 events = @EventConfig(phase = Phase.DECODE, listeners = UIMaskWorkspace.CloseActionListener.class))
 public class UIMaskWorkspace extends UIComponentDecorator
 {