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

Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev

Browse Source
This commit is contained in:
Sebastiaan Janssen
2019-06-27 13:48:43 +02:00
parent 46e0b08d65 9d14c9e0b7
commit bec909c284
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
View File

@@ -174,7 +174,12 @@ namespace Umbraco.Web.PropertyEditors
// more magic here ;-(
var configuration = dataTypeService.GetDataType(propertyType.DataTypeId).ConfigurationAs<ImageCropperConfiguration>();
var crops = configuration?.Crops ?? Array.Empty<ImageCropperConfiguration.Crop>();
return "{src: '" + val + "', crops: " + crops + "}";
return JsonConvert.SerializeObject(new
{
src = val,
crops = crops
});
}
}
}

13
src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
View File

@@ -410,18 +410,7 @@ namespace Umbraco.Web.Trees
internal IEnumerable<MenuItem> GetAllowedUserMenuItemsForNode(IUmbracoEntity dd)
{
var permission = Services.UserService.GetPermissions(Security.CurrentUser, dd.Path);
// TODO: inject
var actions = Current.Actions.FromEntityPermission(permission)
.ToList();
var actionDelete = Current.Actions.GetAction<ActionDelete>();
// A user is allowed to delete their own stuff
var tryGetCurrentUserId = Security.GetUserId();
if (tryGetCurrentUserId && dd.CreatorId == tryGetCurrentUserId.Result && actions.Contains(actionDelete) == false)
actions.Add(actionDelete);
return actions.Select(x => new MenuItem(x));
return Current.Actions.FromEntityPermission(permission).Select(x => new MenuItem(x));
}
/// <summary>