Author: Alex.Kolonitsky Date: 2011-02-07 09:17:40 -0500 (Mon, 07 Feb 2011) New Revision: 21506 Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js Log: RF-10248 PanelMenuItem/PanelMenuGroup: nested UIParam components should be supported Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-02-07 14:16:39 UTC (rev 21505) +++ trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-02-07 14:17:40 UTC (rev 21506) @@ -66,8 +66,20 @@ execute="date-p" render="date-p" - <pn:panelMenuGroup label="Group 1" selectable="true" execute="date-g1" render="date-g1"> - <pn:panelMenuItem execute="date-i" render="date-i">Item 1.1</pn:panelMenuItem> + <pn:panelMenuGroup label="Group 1" selectable="true" execute="date-g1" render="date-g1" mode="server"> + <f:param name="alexParam01" value="alexValue01" /> + <f:param name="alexParam02" value="alexValue02" /> + <f:param name="alexParam03" value="alexValue03" /> + <f:param name="alexParam04" value="alexValue04" /> + + + <pn:panelMenuItem execute="date-i" render="date-i" mode="server"> + <f:param name="alexParam11" value="alexValue11"/> + <f:param name="alexParam12" value="alexValue12"/> + <f:param name="alexParam13" value="alexValue13"/> + <f:param name="alexParam14" value="alexValue14"/> + Item 1.1 + </pn:panelMenuItem> <pn:panelMenuItem execute="date-i" render="date-i">Item 1.2</pn:panelMenuItem> <pn:panelMenuItem execute="date-i" render="date-i">Item 1.3</pn:panelMenuItem> </pn:panelMenuGroup> Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js 2011-02-07 14:16:39 UTC (rev 21505) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js 2011-02-07 14:17:40 UTC (rev 21506) @@ -62,7 +62,7 @@ * */ execServer : function (group) { group.__changeState(); - rf.submitForm(this.__getParentForm(group)); + rf.submitForm(this.__getParentForm(group), group.options["ajax"]["parameters"] || {}); return false; }, Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-02-07 14:16:39 UTC (rev 21505) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-02-07 14:17:40 UTC (rev 21506) @@ -64,6 +64,7 @@ var params = {}; params[item.__panelMenu().id] = item.itemName; + $.extend(params, item.options["ajax"]["parameters"] || {}); rf.submitForm(this.__getParentForm(item), params);