Merge pull request #782 from NicolaIsotta/master

Don't ignore f:selectItem value
TheCoder4eu · May 16, 2017 · 3949342 · 3949342
2 parents f129f2b + 2c87f16
commit 3949342
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/main/java/net/bootsfaces/component/SelectItemUtils.java b/src/main/java/net/bootsfaces/component/SelectItemUtils.java
@@ -93,13 +93,16 @@ public static List<SelectItemAndComponent> collectOptions(FacesContext context,
     }
 
     private static SelectItem toSelectItem(UISelectItem option) {
-		SelectItem item = new SelectItem();
-		item.setDescription(option.getItemDescription());
-		item.setDisabled(option.isItemDisabled());
-		item.setEscape(option.isItemEscaped());
-		item.setLabel(option.getItemLabel());
-		item.setNoSelectionOption(option.isNoSelectionOption());
-		item.setValue(option.getItemValue());
+		SelectItem item = (SelectItem) option.getValue();
+		if (item == null) {
+			item = new SelectItem();
+			item.setDescription(option.getItemDescription());
+			item.setDisabled(option.isItemDisabled());
+			item.setEscape(option.isItemEscaped());
+			item.setLabel(option.getItemLabel());
+			item.setNoSelectionOption(option.isNoSelectionOption());
+			item.setValue(option.getItemValue());
+		}
 		return item;
 	}