Merged V3.4-BUG-FIX to HEAD

32340: Fix for ALF-11737 (refix for ALF-11247) - After clicking on any list item action in Explorer there is no effect
   32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2011-11-28 12:22:30 +00:00
parent eb53b834af
commit e861c81a63
2 changed files with 60 additions and 21 deletions

View File

@@ -103,10 +103,6 @@ public class UIActions extends SelfRenderingComponent
this.showLink = (Boolean)values[2];
this.verticalSpacing = (Integer)values[3];
this.groups = new HashSet<String>(4);
// when the state of the component is restored, clear the child list of components - they
// are always rebuilt on initial page render - otherwise the list will grow forever...
this.getChildren().clear();
}
/**
@@ -161,6 +157,20 @@ public class UIActions extends SelfRenderingComponent
}
}
// look to see if we built a component set for that component group on a previous render
// this will need removing from the child component set to ensure that it does not grow endlessly
for (Iterator i=getChildren().iterator(); i.hasNext(); /**/)
{
UIComponent child = (UIComponent)i.next();
if (contextId.equals(child.getAttributes().get("contextId")))
{
if (logger.isDebugEnabled())
logger.debug("***removing old child component set for contextId: " + contextId);
i.remove();
break;
}
}
String groupId = getValue();
if (groupId != null && groupId.length() != 0)
{