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

WIP fixing issue with macro forms

Browse Source
This commit is contained in:
Shannon
2021-02-26 16:53:53 +11:00
parent f6cf089357
commit abb5911b24
9 changed files with 79 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.Website/Controllers/SurfaceController.cs
View File

@@ -98,7 +98,7 @@ namespace Umbraco.Cms.Web.Website.Controllers
/// </summary>
protected UmbracoPageResult CurrentUmbracoPage()
{
HttpContext.Features.Set(new ProxyViewDataFeature(ViewData));
HttpContext.Features.Set(new ProxyViewDataFeature(ViewData, TempData));
return new UmbracoPageResult(ProfilingLogger);
}
}

6
src/Umbraco.Web.Website/Controllers/UmbLoginController.cs
View File

@@ -1,4 +1,5 @@
using System.Threading.Tasks;
using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Logging;
@@ -35,6 +36,9 @@ namespace Umbraco.Cms.Web.Website.Controllers
return CurrentUmbracoPage();
}
// TODO: This is supposed to be for members! not users
//throw new NotImplementedException("Implement this for members");
if (await _websiteSecurityAccessor.WebsiteSecurity.LoginAsync(model.Username, model.Password) == false)
{
// Don't add a field level error, just model level.

13
src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs
View File

@@ -165,16 +165,11 @@ namespace Umbraco.Extensions
return htmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes);
}
var htmlGenerator = GetRequiredService<IHtmlGenerator>(htmlHelper);
IHtmlGenerator htmlGenerator = GetRequiredService<IHtmlGenerator>(htmlHelper);
var viewContext = htmlHelper.ViewContext.Clone();
foreach (var key in viewContext.ViewData.Keys.ToArray())
{
if (!key.StartsWith(prefix))
{
viewContext.ViewData.Remove(key);
}
}
ViewContext viewContext = htmlHelper.ViewContext.Clone();
//change the HTML field name
viewContext.ViewData.TemplateInfo.HtmlFieldPrefix = prefix;
var tagBuilder = htmlGenerator.GenerateValidationSummary(
viewContext,