Skip to content

Commit 7a83777

Browse files
committed
Fix #82
1 parent 5dfc5bb commit 7a83777

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

dev/schema.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,9 @@ module.exports = {
356356
label: "Role",
357357
model: "role",
358358
required: true,
359+
selectOptions: {
360+
noneSelectedText: "Nincs kijelölve"
361+
},
359362
values: [
360363
{ id: "admin", name: "Administrator" },
361364
{ id: "moderator", name: "Moderator" },
@@ -424,7 +427,8 @@ module.exports = {
424427
selectOptions: {
425428
// https://silviomoreto.github.io/bootstrap-select/options/
426429
liveSearch: true,
427-
size: 10
430+
size: 10,
431+
noneSelectedText: "Nincs kijelölve"
428432
},
429433
styleClasses: "half-width",
430434
validator: validators.required
@@ -434,7 +438,7 @@ module.exports = {
434438
label: "Skills (selectEx field)",
435439
model: "skills",
436440
multi: true,
437-
required: true,
441+
required: false,
438442
multiSelect: true,
439443
selectOptions: {
440444
// https://silviomoreto.github.io/bootstrap-select/options/

src/fields/fieldSelect.vue

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template lang="jade">
22
select.form-control(v-model="value", :disabled="disabled", :name="schema.inputName")
3-
option(:disabled="schema.required", :value="null", :selected="value == undefined") &lt;Not selected&gt;
3+
option(:disabled="schema.required", :value="null", :selected="value == undefined") {{ selectOptions.noneSelectedText || "&lt;Nothing selected&gt;" }}
44
option(v-for="item in items", :value="getItemID(item)") {{ getItemName(item) }}
55
</template>
66

@@ -12,6 +12,10 @@
1212
mixins: [ abstractField ],
1313
1414
computed: {
15+
selectOptions() {
16+
return this.schema.selectOptions || {}
17+
},
18+
1519
items() {
1620
let values = this.schema.values;
1721
if (typeof(values) == "function") {

src/fields/fieldSelectEx.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template lang="jade">
22
select.selectpicker(v-model="value", :disabled="disabled", :multiple="schema.multiSelect", :title="schema.placeholder", data-width="100%", :name="schema.inputName")
3-
option(:disabled="schema.required", v-if="schema.multiSelect !== true", :value="null", :selected="value == undefined") &lt;Not selected&gt;
3+
option(:disabled="schema.required", v-if="schema.multiSelect !== true", :value="null", :selected="value == undefined")
44
option(v-for="item in items", :value="getItemID(item)") {{ getItemName(item) }}
55
</template>
66

0 commit comments

Comments
 (0)