lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6554 from jtkech/patch-20

Browse Source 
Fixing TextField default values
This commit is contained in:
Sébastien Ros
2016-03-08 17:22:34 -08:00
parent 1def97d9ce cf5ada1d4b
commit 7fb4740e29
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
View File

@@ -72,6 +72,7 @@ namespace Orchard.Core.Common.Drivers {
() => shapeHelper.EditorTemplate(TemplateName: "Fields.Common.Text.Edit", Model: viewModel, Prefix: GetPrefix(field, part)));
}
field.Value = viewModel.Text;
var settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>();
if (String.IsNullOrEmpty(field.Value) && !String.IsNullOrEmpty(settings.DefaultValue)) {
@@ -103,4 +104,4 @@ namespace Orchard.Core.Common.Drivers {
.Enumerate<TextField>(() => field => new[] { field.Value });
}
}
}
}

4
src/Orchard.Web/Modules/Orchard.Fields/Drivers/TextFieldDriver.cs
View File

@@ -19,11 +19,11 @@ namespace Orchard.Fields.Drivers {
protected override DriverResult Editor(ContentPart part, TextField field, IUpdateModel updater, dynamic shapeHelper) {
var settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>();
if (String.IsNullOrEmpty(field.Value) && !String.IsNullOrEmpty(settings.DefaultValue)) {
if (!String.IsNullOrEmpty(settings.DefaultValue) && (String.IsNullOrEmpty(field.Value) || field.Value.Equals(settings.DefaultValue))) {
field.Value = _tokenizer.Replace(settings.DefaultValue, new Dictionary<string, object> { { "Content", part.ContentItem } });
}
return null;
}
}
}
}