Author: andrei_exadel
Date: 2008-07-16 08:38:50 -0400 (Wed, 16 Jul 2008)
New Revision: 9634
Modified:
trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java
Log:
RF-3861
Modified:
trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java
===================================================================
---
trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-07-16
12:31:39 UTC (rev 9633)
+++
trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-07-16
12:38:50 UTC (rev 9634)
@@ -197,13 +197,20 @@
UIToolBar toolbar = getParentToolBar(component);
Map<String, Object> attributes = toolbar.getAttributes();
+ Map<String, Object> groupAttributes = component.getAttributes();
for (int i = 0; i < ON_ITEM_EVENTS.length; i++) {
+ String eventName = ON_ITEM_EVENTS[i].replace("item", "");
Object value = attributes.get(ON_ITEM_EVENTS[i]);
- if (null != value && !"".equals(value)) {
- String eventName = ON_ITEM_EVENTS[i].replace("item", "");
- getUtils().writeAttribute(writer, eventName, value);
+ Object groupValue = groupAttributes.get(eventName);
+ String attrvalue = "";
+ if ((null != value && !"".equals(value))) {
+ attrvalue = attrvalue + value;
}
+ if ((null != groupValue && !"".equals(groupValue))) {
+ attrvalue = attrvalue + ";" + groupValue;
+ }
+ getUtils().writeAttribute(writer, eventName, attrvalue);
}
}
Show replies by date