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

Merge branch 'release/13.0' into v13/dev

Browse Source 
# Conflicts:
#	version.json
This commit is contained in:
Nikolaj Geisle
2023-12-14 16:33:27 +01:00
parent 38879e11df 36b7b86384
commit 8ecc5552ab
2 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_0_0/ChangeLogStatusCode.cs
View File

@@ -2,7 +2,7 @@
using NPoco;
using Umbraco.Cms.Core;
using Umbraco.Cms.Infrastructure.Persistence;
using Umbraco.Cms.Infrastructure.Persistence.Dtos;
using Umbraco.Cms.Infrastructure.Persistence.DatabaseAnnotations;
using Umbraco.Extensions;
namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_13_0_0;
@@ -21,18 +21,18 @@ public class ChangeLogStatusCode : MigrationBase
}
Sql<ISqlContext> fetchQuery = Database.SqlContext.Sql()
.Select<WebhookLogDto>()
.From<WebhookLogDto>();
.Select<WebhookLogDtoOld>()
.From<WebhookLogDtoOld>();
// Use a custom SQL query to prevent selecting explicit columns (sortOrder doesn't exist yet)
List<WebhookLogDto> webhookLogDtos = Database.Fetch<WebhookLogDto>(fetchQuery);
List<WebhookLogDtoOld> webhookLogDtos = Database.Fetch<WebhookLogDtoOld>(fetchQuery);
Sql<ISqlContext> deleteQuery = Database.SqlContext.Sql()
.Delete<WebhookLogDto>();
.Delete<WebhookLogDtoOld>();
Database.Execute(deleteQuery);
foreach (WebhookLogDto webhookLogDto in webhookLogDtos)
foreach (WebhookLogDtoOld webhookLogDto in webhookLogDtos)
{
if (Enum.TryParse(webhookLogDto.StatusCode, out HttpStatusCode statusCode))
{
@@ -42,4 +42,62 @@ public class ChangeLogStatusCode : MigrationBase
Database.InsertBatch(webhookLogDtos);
}
[TableName(Constants.DatabaseSchema.Tables.WebhookLog)]
[PrimaryKey("id")]
[ExplicitColumns]
private class WebhookLogDtoOld
{
[Column("id")]
[PrimaryKeyColumn(AutoIncrement = true)]
public int Id { get; set; }
[Column("webhookKey")] public Guid WebhookKey { get; set; }
[Column(Name = "key")]
[NullSetting(NullSetting = NullSettings.NotNull)]
public Guid Key { get; set; }
[Column(Name = "statusCode")]
[NullSetting(NullSetting = NullSettings.NotNull)]
public string StatusCode { get; set; } = string.Empty;
[Column(Name = "date")]
[Index(IndexTypes.NonClustered, Name = "IX_" + Constants.DatabaseSchema.Tables.WebhookLog + "_date")]
[NullSetting(NullSetting = NullSettings.NotNull)]
public DateTime Date { get; set; }
[Column(Name = "url")]
[SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
[NullSetting(NullSetting = NullSettings.NotNull)]
public string Url { get; set; } = string.Empty;
[Column(Name = "eventAlias")]
[NullSetting(NullSetting = NullSettings.NotNull)]
public string EventAlias { get; set; } = string.Empty;
[Column(Name = "retryCount")]
[NullSetting(NullSetting = NullSettings.NotNull)]
public int RetryCount { get; set; }
[Column(Name = "requestHeaders")]
[SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
[NullSetting(NullSetting = NullSettings.NotNull)]
public string RequestHeaders { get; set; } = string.Empty;
[Column(Name = "requestBody")]
[SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
[NullSetting(NullSetting = NullSettings.NotNull)]
public string RequestBody { get; set; } = string.Empty;
[Column(Name = "responseHeaders")]
[SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
[NullSetting(NullSetting = NullSettings.NotNull)]
public string ResponseHeaders { get; set; } = string.Empty;
[Column(Name = "responseBody")]
[SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
[NullSetting(NullSetting = NullSettings.NotNull)]
public string ResponseBody { get; set; } = string.Empty;
}
}

2
src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs
View File

@@ -18,7 +18,6 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers;
/// Backoffice controller supporting the dashboard for language administration.
/// </summary>
[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
public class LanguageController : UmbracoAuthorizedJsonController
{
private readonly ILocalizationService _localizationService;
@@ -44,7 +43,6 @@ public class LanguageController : UmbracoAuthorizedJsonController
/// </summary>
/// <returns></returns>
[HttpGet]
[Authorize(Policy = AuthorizationPolicies.SectionAccessContent)]
public IEnumerable<Language>? GetAllLanguages()
{
IEnumerable<ILanguage> allLanguages = _localizationService.GetAllLanguages();