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

Fixing issue where BodyPArt is not there. Now passing ContentItem

Browse Source
This commit is contained in:
Nicholas Mayne
2014-09-09 15:08:14 +01:00
parent 66010bcb91
commit a9fdadfa13
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,8 @@ namespace Orchard.Core.Common.Drivers {
var viewModel = new TextFieldDriverViewModel { var viewModel = new TextFieldDriverViewModel {
Field = field, Field = field,
Text = field.Value, Text = field.Value,
Settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>() Settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>(),
ContentItem = part.ContentItem
}; };
return shapeHelper.EditorTemplate(TemplateName: "Fields.Common.Text.Edit", Model: viewModel, Prefix: GetPrefix(field, part)); return shapeHelper.EditorTemplate(TemplateName: "Fields.Common.Text.Edit", Model: viewModel, Prefix: GetPrefix(field, part));
@@ -61,7 +62,8 @@ namespace Orchard.Core.Common.Drivers {
var viewModel = new TextFieldDriverViewModel { var viewModel = new TextFieldDriverViewModel {
Field = field, Field = field,
Text = field.Value, Text = field.Value,
Settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>() Settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>(),
ContentItem = part.ContentItem
}; };
if(updater.TryUpdateModel(viewModel, GetPrefix(field, part), null, null)) { if(updater.TryUpdateModel(viewModel, GetPrefix(field, part), null, null)) {

6
src/Orchard.Web/Core/Common/ViewModels/TextFieldDriverViewModel.cs
View File

@@ -1,10 +1,12 @@
using Orchard.Core.Common.Fields; using Orchard.ContentManagement;
using Orchard.Core.Common.Fields;
using Orchard.Core.Common.Settings; using Orchard.Core.Common.Settings;
namespace Orchard.Core.Common.ViewModels { namespace Orchard.Core.Common.ViewModels {
public class TextFieldDriverViewModel { public class TextFieldDriverViewModel {
public TextField Field { get; set; } public TextField Field { get; set; }
public string Text { get; set; } public string Text { get; set; }
public TextFieldSettings Settings { get; set; } public TextFieldSettings Settings { get; set; }
public IContent ContentItem { get; set; }
} }
} }

2
src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
View File

@@ -7,7 +7,7 @@
@Html.ValidationMessageFor(m => m.Text) @Html.ValidationMessageFor(m => m.Text)
} }
else { else {
@Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.Settings.Flavor, Required: Model.Settings.Required) @Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.Settings.Flavor, Required: Model.Settings.Required, ContentItem: Model.ContentItem)
} }
@if (HasText(Model.Settings.Hint)) { @if (HasText(Model.Settings.Hint)) {
<span class="hint">@Model.Settings.Hint</span> <span class="hint">@Model.Settings.Hint</span>

2
src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts.Common.Body.cshtml
View File

@@ -2,6 +2,6 @@
@using Orchard.Core.Common.ViewModels; @using Orchard.Core.Common.ViewModels;
<fieldset> <fieldset>
<label>@T("Body")</label> <label>@T("Body")</label>
@Display.Body_Editor(Model) @Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.EditorFlavor, Required: false, ContentItem: Model.BodyPart.ContentItem)
@Html.ValidationMessageFor(m => m.Text) @Html.ValidationMessageFor(m => m.Text)
</fieldset> </fieldset>

2
src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml
View File

@@ -9,7 +9,7 @@
<script type="text/javascript"> <script type="text/javascript">
var mediaPickerEnabled = @(shellDescriptor.Features.Any(x => x.Name == "Orchard.MediaPicker") ? "true" : "false"); var mediaPickerEnabled = @(shellDescriptor.Features.Any(x => x.Name == "Orchard.MediaPicker") ? "true" : "false");
var mediaLibraryEnabled = @(shellDescriptor.Features.Any(x => x.Name == "Orchard.MediaLibrary") ? "true" : "false"); var mediaLibraryEnabled = @(shellDescriptor.Features.Any(x => x.Name == "Orchard.MediaLibrary") ? "true" : "false");
var directionality = '@WorkContext.GetTextDirection((IContent)Model.BodyPart.ContentItem)'; var directionality = '@WorkContext.GetTextDirection((IContent)Model.ContentItem)';
var language = '@Model.Language'; var language = '@Model.Language';
</script> </script>