#842 #842 command buttons should work even if they are in a tab

TheCoder4eu · Aug 21, 2017 · 4cd183d · 4cd183d
1 parent 0b33e74
commit 4cd183d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/net/bootsfaces/component/tab/TabRenderer.java b/src/main/java/net/bootsfaces/component/tab/TabRenderer.java
@@ -35,6 +35,9 @@ public class TabRenderer extends CoreRenderer {
 	public void decode(FacesContext context, UIComponent component) {
 		// The AJAXRenderer generates the id of the child element, but the AJAX event is processed by the parent instead
 		component.getParent().decode(context);
+		for (UIComponent c: component.getChildren()) {
+			c.decode(context);
+		}
 	}
 
 	/**

diff --git a/src/main/java/net/bootsfaces/component/tabView/TabViewRenderer.java b/src/main/java/net/bootsfaces/component/tabView/TabViewRenderer.java
@@ -86,21 +86,23 @@ public void decode(FacesContext context, UIComponent component) {
 				if (Integer.valueOf(newIndexValue) != tabView.getActiveIndex()) {
 					int newIndex = Integer.valueOf(newIndexValue);
 					if (newIndex < tabView.getChildCount()) {
-						if (!(((Tab) tabView.getChildren().get(newIndex)).isDisabled())) {
-
-							ValueExpression ve = component.getValueExpression("activeIndex");
-							if (ve != null) {
-								try {
-									ve.setValue(context.getELContext(), newIndex);
-								} catch (ELException e) {
-									tabView.setActiveIndex(newIndex);
-								} catch (Exception e) {
+						UIComponent maybeTab = tabView.getChildren().get(newIndex);
+						if (maybeTab instanceof Tab) {
+							if (!(((Tab) maybeTab).isDisabled())) {
+								ValueExpression ve = component.getValueExpression("activeIndex");
+								if (ve != null) {
+									try {
+										ve.setValue(context.getELContext(), newIndex);
+									} catch (ELException e) {
+										tabView.setActiveIndex(newIndex);
+									} catch (Exception e) {
+										tabView.setActiveIndex(newIndex);
+									}
+								} else {
 									tabView.setActiveIndex(newIndex);
 								}
-							} else {
-								tabView.setActiveIndex(newIndex);
+
 							}
-
 						}
 					}
 				}