yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes how modelstate and viewdata get populated into the PartialViewMacroController and in turn get populated into the viewresult, privatize's EnsureViewObjectDataOnResult so that it's not used by accident elsewhere

Browse Source
This commit is contained in:
Shannon
2015-07-22 18:25:08 +02:00
parent 44c3140b20
commit 96cd4daca5
2 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web/Macros/PartialViewMacroEngine.cs
View File

@@ -140,12 +140,11 @@ namespace Umbraco.Web.Macros
string output;
using (var controller = new PartialViewMacroController(macro, content))
{
//bubble up the model state from the main view context to our custom controller.
//when merging we'll create a new dictionary, otherwise you might run into an enumeration error
// caused from ModelStateDictionary
controller.ModelState.Merge(new ModelStateDictionary(viewContext.ViewData.ModelState));
controller.ViewData = viewContext.ViewData;
controller.ControllerContext = new ControllerContext(request, controller);
//call the action to render
//call the action to render
var result = controller.Index();
output = controller.RenderViewResultAsString(result);
}

19
src/Umbraco.Web/Mvc/ControllerExtensions.cs
View File

@@ -130,26 +130,13 @@ namespace Umbraco.Web.Mvc
/// <summary>
/// Normally in MVC the way that the View object gets assigned to the result is to Execute the ViewResult, this however
/// will write to the Response output stream which isn't what we want. Instead, this method will use the same logic inside
/// of MVC to assign the View object to the result but without executing it. This also ensures that the ViewData and the TempData
/// is assigned from the controller.
/// of MVC to assign the View object to the result but without executing it.
/// This is only relavent for view results of PartialViewResult or ViewResult.
/// </summary>
/// <param name="result"></param>
/// <param name="controller"></param>
internal static void EnsureViewObjectDataOnResult(this ControllerBase controller, ViewResultBase result)
{
result.TempData = controller.TempData;
var newViewDataDict = new ViewDataDictionary(controller.ViewData);
var viewDataDictionary = result.ViewData;
foreach (var d in newViewDataDict)
viewDataDictionary[d.Key] = d.Value;
result.ViewData = viewDataDictionary;
foreach (var keyValuePair in controller.ViewData.ModelState.Keys)
result.ViewData[keyValuePair] = keyValuePair;
private static void EnsureViewObjectDataOnResult(this ControllerBase controller, ViewResultBase result)
{
if (result.View != null) return;
if (string.IsNullOrEmpty(result.ViewName))