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

Fixes merge issues with 6.2 and copying across TempData properly.

Browse Source
This commit is contained in:
Shannon
2013-10-08 10:46:02 +11:00
parent a2e9ec0412
commit 16bce4248d
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web/Mvc/UmbracoPageResult.cs
View File

@@ -27,8 +27,6 @@ namespace Umbraco.Web.Mvc
{
controller = CreateController(context, factory, routeDef);
controller.ViewData.ModelState.Merge(context.Controller.ViewData.ModelState);
CopyControllerData(context, controller);
ExecuteControllerAction(context, controller);
@@ -73,14 +71,29 @@ namespace Umbraco.Web.Mvc
}
/// <summary>
/// Ensure TempData and ViewData is copied across
/// Ensure ModelState, ViewData and TempData is copied across
/// </summary>
private static void CopyControllerData(ControllerContext context, ControllerBase controller)
{
controller.ViewData.ModelState.Merge(context.Controller.ViewData.ModelState);
foreach (var d in context.Controller.ViewData)
controller.ViewData[d.Key] = d.Value;
controller.TempData = context.Controller.TempData;
//We cannot simply merge the temp data because during controller execution it will attempt to 'load' temp data
// but since it has not been saved, there will be nothing to load and it will revert to nothing, so the trick is
// to Save the state of the temp data first then it will automatically be picked up.
// http://issues.umbraco.org/issue/U4-1339
var targetController = controller as Controller;
var sourceController = context.Controller as Controller;
if (targetController != null && sourceController != null)
{
targetController.TempDataProvider = sourceController.TempDataProvider;
targetController.TempData = sourceController.TempData;
targetController.TempData.Save(sourceController.ControllerContext, sourceController.TempDataProvider);
}
}
/// <summary>