From 42b4fcb533282da446a72ccfc8b7bd7b7128b6e7 Mon Sep 17 00:00:00 2001
From: Icebob <mereg.norbert@gmail.com>
Date: Sat, 1 Jul 2017 13:58:57 +0200
Subject: [PATCH] Fixed #234

---
 dev/full/schema.js              |  3 +++
 src/fields/core/fieldSelect.vue | 39 ++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/dev/full/schema.js b/dev/full/schema.js
index 131340d7..52d5aa83 100644
--- a/dev/full/schema.js
+++ b/dev/full/schema.js
@@ -457,6 +457,9 @@ module.exports = {
 			values: [{
 				id: "admin",
 				name: "Administrator"
+			}, {
+				id: 0,
+				name: "Zero"
 			}, {
 				id: "moderator",
 				name: "Moderator"
diff --git a/src/fields/core/fieldSelect.vue b/src/fields/core/fieldSelect.vue
index fed5e4c3..3317efe1 100644
--- a/src/fields/core/fieldSelect.vue
+++ b/src/fields/core/fieldSelect.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 	select.form-control(v-model="value", :disabled="disabled", :name="schema.inputName", :id="getFieldID(schema)")
 		option(v-if="!selectOptions.hideNoneSelectedText", :disabled="schema.required", :value="null", :selected="value == undefined") {{ selectOptions.noneSelectedText || "&lt;Nothing selected&gt;" }}
-		option(v-for="item in items", :value="getItemID(item)") {{ getItemName(item) }}
+		option(v-for="item in items", :value="getItemValue(item)") {{ getItemName(item) }}
 </template>
 
 <script>
@@ -26,18 +26,37 @@
 		},
 
 		methods: {
-			getItemID(item) {
-				if (isObject(item) && item.id)
-					return item.id;
-
-				return item;
+			getItemValue(item) {
+				if (isObject(item)){
+					if (typeof this.schema["selectOptions"] !== "undefined" && typeof this.schema["selectOptions"]["value"] !== "undefined") {
+						return item[this.schema.selectOptions.value];
+					} else {
+						// Use 'id' instead of 'value' cause of backward compatibility
+						if (typeof item["id"] !== "undefined") {
+							return item.id;
+						} else {
+							throw "id is not defined. If you want to use another key name, add a `value` property under `selectOptions` in the schema. https://icebob.gitbooks.io/vueformgenerator/content/fields/select.html#select-field-with-object-items";
+						}
+					}
+				} else {
+					return item;
+				}
 			},
 
 			getItemName(item) {
-				if (isObject(item) && item.name)
-					return item.name;
-
-				return item;
+				if (isObject(item)){
+					if (typeof this.schema["selectOptions"] !== "undefined" && typeof this.schema["selectOptions"]["name"] !== "undefined") {
+						return item[this.schema.selectOptions.name];
+					} else {
+						if (typeof item["name"] !== "undefined") {
+							return item.name;
+						} else {
+							throw "name is not defined. If you want to use another key name, add a `name` property under `selectOptions` in the schema. https://icebob.gitbooks.io/vueformgenerator/content/fields/select.html#select-field-with-object-items";
+						}
+					}
+				} else {
+					return item;
+				}
 			}
 		}
 	};