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

Merge branch 'netcore/netcore' into netcore/members-userstore

Browse Source
This commit is contained in:
emmagarland
2020-12-05 18:14:09 +00:00
parent 57684a8672 e3761c7499
commit 0560bef48c
189 changed files with 4945 additions and 1613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
View File

@@ -161,7 +161,7 @@ namespace Umbraco.Web.BackOffice.Controllers
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
[TypeFilter(typeof(OutgoingEditorModelEventAttribute))]
[OutgoingEditorModelEvent]
public MemberDisplay GetByKey(Guid key)
{
//TODO: this is not finding the key currently
@@ -178,7 +178,7 @@ namespace Umbraco.Web.BackOffice.Controllers
/// </summary>
/// <param name="contentTypeAlias"></param>
/// <returns></returns>
[TypeFilter(typeof(OutgoingEditorModelEventAttribute))]
[OutgoingEditorModelEvent]
public MemberDisplay GetEmpty(string contentTypeAlias = null)
{
if (contentTypeAlias == null)
@@ -204,7 +204,7 @@ namespace Umbraco.Web.BackOffice.Controllers
/// </summary>
/// <returns></returns>
[FileUploadCleanupFilter]
[TypeFilter(typeof(OutgoingEditorModelEventAttribute))]
[OutgoingEditorModelEvent]
[MemberSaveValidation]
public async Task<ActionResult<MemberDisplay>> PostSave(
[ModelBinder(typeof(MemberBinder))]