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

Merge remote-tracking branch 'origin/v9/dev' into v10/dev

Browse Source 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
This commit is contained in:
Bjarke Berg
2021-11-22 19:43:20 +01:00
parent 61f459670c 351c37abc0
commit 78dc2d5721
533 changed files with 22641 additions and 49115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
View File

@@ -62,6 +62,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
private readonly ActionCollection _actionCollection;
private readonly ISqlContext _sqlContext;
private readonly IAuthorizationService _authorizationService;
private readonly IContentVersionService _contentVersionService;
private readonly Lazy<IDictionary<string, ILanguage>> _allLangs;
private readonly ILogger<ContentController> _logger;
private readonly IScopeProvider _scopeProvider;
@@ -90,7 +91,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
ISqlContext sqlContext,
IJsonSerializer serializer,
IScopeProvider scopeProvider,
IAuthorizationService authorizationService)
IAuthorizationService authorizationService,
IContentVersionService contentVersionService)
: base(cultureDictionary, loggerFactory, shortStringHelper, eventMessages, localizedTextService, serializer)
{
_propertyEditors = propertyEditors;
@@ -109,6 +111,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
_actionCollection = actionCollection;
_sqlContext = sqlContext;
_authorizationService = authorizationService;
_contentVersionService = contentVersionService;
_logger = loggerFactory.CreateLogger<ContentController>();
_scopeProvider = scopeProvider;
_allLangs = new Lazy<IDictionary<string, ILanguage>>(() => _localizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x, StringComparer.InvariantCultureIgnoreCase));
@@ -164,27 +167,16 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
IEnumerable<string> groupPermissions;
if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
{
//create a string collection of the assigned letters
var groupPermissionCodes = groupPermissions.ToArray();
//check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
//for this group/node which will go back to the defaults
if (groupPermissionCodes.Length == 0)
if (groupPermissions is null)
{
_userService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
continue;
}
//check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
{
//only remove them if they are actually currently assigned
if (contentPermissions.ContainsKey(userGroup.Id))
{
//remove these permissions from this node for this group since the ones being assigned are the same as the defaults
_userService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
}
}
//if they are different we need to update, otherwise there's nothing to update
else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
// Create a string collection of the assigned letters
var groupPermissionCodes = groupPermissions.ToArray();
// Check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
{
_userService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
@@ -2510,6 +2502,53 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
return NoContent();
}
[HttpGet]
[JsonCamelCaseFormatter]
public IActionResult GetPagedContentVersions(
int contentId,
int pageNumber = 1,
int pageSize = 10,
string culture = null)
{
if (!string.IsNullOrEmpty(culture))
{
if (!_allLangs.Value.TryGetValue(culture, out _))
{
return NotFound();
}
}
IEnumerable<ContentVersionMeta> results = _contentVersionService.GetPagedContentVersions(
contentId,
pageNumber - 1,
pageSize,
out var totalRecords,
culture);
var model = new PagedResult<ContentVersionMeta>(totalRecords, pageNumber, pageSize)
{
Items = results
};
return Ok(model);
}
[HttpPost]
[Authorize(Policy = AuthorizationPolicies.ContentPermissionAdministrationById)]
public IActionResult PostSetContentVersionPreventCleanup(int contentId, int versionId, bool preventCleanup)
{
IContent content = _contentService.GetVersion(versionId);
if (content == null || content.Id != contentId)
{
return NotFound();
}
_contentVersionService.SetPreventCleanup(versionId, preventCleanup, _backofficeSecurityAccessor.BackOfficeSecurity.GetUserId().ResultOr(0));
return NoContent();
}
[HttpGet]
public IEnumerable<RollbackVersion> GetRollbackVersions(int contentId, string culture = null)
{