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

Fixes testing custom invite user flow and the AllowManualLinking setting for external providers

Browse Source
This commit is contained in:
Shannon
2020-09-07 18:46:38 +10:00
parent f2b8f355e1
commit af53f27bc3
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
View File

@@ -22,9 +22,9 @@ namespace Umbraco.Web.Editors.Filters
if (objectContent != null)
{
var model = objectContent.Value as UserBasic;
if (model != null)
if (model != null && model.Id is int userId)
{
model.IsCurrentUser = (int) model.Id == user.Id;
model.IsCurrentUser = userId == user.Id;
}
else
{
@@ -33,7 +33,10 @@ namespace Umbraco.Web.Editors.Filters
{
foreach (var userBasic in collection)
{
userBasic.IsCurrentUser = (int) userBasic.Id == user.Id;
if (userBasic.Id is int uid)
{
userBasic.IsCurrentUser = uid == user.Id;
}
}
}
else
@@ -43,7 +46,10 @@ namespace Umbraco.Web.Editors.Filters
{
foreach (var userBasic in paged.Items)
{
userBasic.IsCurrentUser = (int)userBasic.Id == user.Id;
if (userBasic.Id is int uid)
{
userBasic.IsCurrentUser = uid == user.Id;
}
}
}
}