Skip to content

Commit 5e48b76

Browse files
committed
Fixing that EnumerationFieldDriver and the EnumerationField editor template should read SelectedValues instead of Values directly
1 parent 31ef61e commit 5e48b76

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected override DriverResult Editor(ContentPart part, EnumerationField field,
3333
if (part.IsNew() && string.IsNullOrEmpty(field.Value)) {
3434
var settings = field.PartFieldDefinition.Settings.GetModel<EnumerationFieldSettings>();
3535
if (!string.IsNullOrWhiteSpace(settings.DefaultValue)) {
36-
field.Value = settings.DefaultValue;
36+
field.SelectedValues = new string[] { settings.DefaultValue };
3737
}
3838
}
3939

src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Enumeration.Edit.cshtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
<label for="@Html.FieldIdFor(m => m.Value)" @if (settings.Required) { <text> class="required" </text> }>@Model.DisplayName</label>
1212
@switch (settings.ListMode) {
1313
case ListMode.Dropdown:
14-
@Html.DropDownListFor(m => m.Value, new SelectList(options, Model.Value), settings.Required ? new { required = "required" } : null)
14+
@Html.DropDownListFor(m => m.Value, new SelectList(options, Model.SelectedValues.FirstOrDefault()), settings.Required ? new { required = "required" } : null)
1515
break;
1616

1717
case ListMode.Radiobutton:
1818
foreach (var option in options) {
1919
if (string.IsNullOrWhiteSpace(option)) {
20-
<label>@Html.RadioButton("Value", "", string.IsNullOrWhiteSpace(Model.Value), settings.Required ? new { required = "required" } : null)<i>@T("unset")</i></label>
20+
<label>@Html.RadioButton("Value", "", string.IsNullOrWhiteSpace(Model.SelectedValues.FirstOrDefault()), settings.Required ? new { required = "required" } : null)<i>@T("unset")</i></label>
2121
}
2222
else {
23-
<label>@Html.RadioButton("Value", option, (option == Model.Value), settings.Required ? new { required = "required" } : null)@option</label>
23+
<label>@Html.RadioButton("Value", option, (option == Model.SelectedValues.FirstOrDefault()), settings.Required ? new { required = "required" } : null)@option</label>
2424
}
2525
}
2626
break;

0 commit comments

Comments
 (0)