lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Added extra information to element editor context.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-03-15 16:27:52 +01:00
parent b12e64bef9
commit 575b78949d
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Orchard.Web/Modules/Orchard.Layouts/Controllers/ElementController.cs
View File

@@ -106,7 +106,7 @@ namespace Orchard.Layouts.Controllers {
var descriptor = _elementManager.GetElementDescriptorByTypeName(describeContext, model.TypeName);
var data = Request.Form.ToDictionary();
var element = _elementManager.ActivateElement(descriptor, e => e.Data = data);
var context = CreateEditorContext(session, describeContext.Content, element, elementData: data, updater: this);
var context = CreateEditorContext(session, describeContext.Content, element, postedElementData: data, updater: this);
var editorResult = _elementManager.UpdateEditor(context);
var viewModel = new EditElementViewModel {
SessionKey = session,
@@ -159,13 +159,12 @@ namespace Orchard.Layouts.Controllers {
var contentId = sessionState.ContentId;
var contentType = sessionState.ContentType;
var typeName = sessionState.TypeName;
var elementData = sessionState.ElementData;
var elementEditorData = sessionState.ElementEditorData;
var elementData = ElementDataHelper.Deserialize(sessionState.ElementData);
var describeContext = CreateDescribeContext(contentId, contentType);
var descriptor = _elementManager.GetElementDescriptorByTypeName(describeContext, typeName);
var data = ElementDataHelper.Deserialize(elementData).Combine(ElementDataHelper.Deserialize(elementEditorData));
var data = elementData.Combine(ElementDataHelper.Deserialize(sessionState.ElementEditorData));
var element = _elementManager.ActivateElement(descriptor, e => e.Data = data);
var context = CreateEditorContext(session, describeContext.Content, element, elementData: data);
var context = CreateEditorContext(session, describeContext.Content, element, postedElementData: data, elementData: elementData);
var editorResult = _elementManager.BuildEditor(context);
var viewModel = new EditElementViewModel {
@@ -190,9 +189,10 @@ namespace Orchard.Layouts.Controllers {
var contentType = sessionState.ContentType;
var describeContext = CreateDescribeContext(contentId, contentType);
var descriptor = _elementManager.GetElementDescriptorByTypeName(describeContext, model.TypeName);
var elementData = ElementDataHelper.Deserialize(sessionState.ElementData);
var data = Request.Form.ToDictionary();
var element = _elementManager.ActivateElement(descriptor, e => e.Data = data);
var context = CreateEditorContext(session, describeContext.Content, element, data, updater: this);
var context = CreateEditorContext(session, describeContext.Content, element, postedElementData: data, elementData: elementData, updater: this);
var editorResult = _elementManager.UpdateEditor(context);
var viewModel = new EditElementViewModel {
Layout = describeContext.Content.As<ILayoutAspect>(),
@@ -225,15 +225,17 @@ namespace Orchard.Layouts.Controllers {
IContent content,
Element element,
ElementDataDictionary elementData = null,
ElementDataDictionary postedElementData = null,
IUpdateModel updater = null) {
elementData = elementData ?? new ElementDataDictionary();
postedElementData = postedElementData ?? new ElementDataDictionary();
var context = new ElementEditorContext {
Session = session,
Content = content,
Element = element,
Updater = updater,
ValueProvider = elementData.ToValueProvider(_cultureAccessor.CurrentCulture),
ElementData = elementData ?? new ElementDataDictionary(),
ValueProvider = postedElementData.ToValueProvider(_cultureAccessor.CurrentCulture),
ShapeFactory = _shapeFactory
};
ValueProvider = context.ValueProvider;

1
src/Orchard.Web/Modules/Orchard.Layouts/Framework/Drivers/ElementEditorContext.cs
View File

@@ -16,5 +16,6 @@ namespace Orchard.Layouts.Framework.Drivers {
public string Prefix { get; set; }
public EditorResult EditorResult { get; set; }
public string Session { get; set; }
public ElementDataDictionary ElementData { get; set; }
}
}