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

Merge branch 'v8/dev' into v8/contrib

Browse Source
This commit is contained in:
Sebastiaan Janssen
2021-07-22 14:01:55 +02:00
parent 8efdc5a047 1e13f3feea
commit d615c1e88b
5 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
View File

@@ -206,6 +206,7 @@ namespace Umbraco.Core.Migrations.Upgrade
// to 8.15.0...
To<AddCmsContentNuByteColumn>("{8DDDCD0B-D7D5-4C97-BD6A-6B38CA65752F}");
To<UpgradedIncludeIndexes>("{4695D0C9-0729-4976-985B-048D503665D8}");
To<UpdateCmsPropertyGroupIdSeed>("{5C424554-A32D-4852-8ED1-A13508187901}");
//FINAL
}

21
src/Umbraco.Core/Migrations/Upgrade/V_8_15_0/UpdateCmsPropertyGroupIdSeed.cs Normal file
View File

@@ -0,0 +1,21 @@
using NPoco;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Dtos;
namespace Umbraco.Core.Migrations.Upgrade.V_8_15_0
{
public class UpdateCmsPropertyGroupIdSeed : MigrationBase
{
public UpdateCmsPropertyGroupIdSeed(IMigrationContext context) : base(context)
{
}
public override void Migrate()
{
if (DatabaseType.IsSqlCe())
{
Database.Execute(Sql("ALTER TABLE [cmsPropertyTypeGroup] ALTER COLUMN [id] IDENTITY (56,1)"));
}
}
}
}

2
src/Umbraco.Core/Persistence/Dtos/PropertyTypeGroupDto.cs
View File

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Persistence.Dtos
internal class PropertyTypeGroupDto
{
[Column("id")]
[PrimaryKeyColumn(IdentitySeed = 12)]
[PrimaryKeyColumn(IdentitySeed = 56)]
public int Id { get; set; }
[Column("contenttypeNodeId")]

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -141,6 +141,7 @@
<Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
<Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyTypeDto80.cs" />
<Compile Include="Migrations\Upgrade\V_8_15_0\AddCmsContentNuByteColumn.cs" />
<Compile Include="Migrations\Upgrade\V_8_15_0\UpdateCmsPropertyGroupIdSeed.cs" />
<Compile Include="Migrations\Upgrade\V_8_15_0\UpgradedIncludeIndexes.cs" />
<Compile Include="Migrations\Upgrade\V_8_10_0\AddPropertyTypeLabelOnTopColumn.cs" />
<Compile Include="Migrations\Upgrade\V_8_9_0\ExternalLoginTableUserData.cs" />

4
src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
View File

@@ -126,7 +126,9 @@
// close all editors
if (args && !args.editor && args.editors.length === 0) {
editorCount = 0;
scope.editors = [];
scope.editors = [];
// Remove the inert attribute from the #mainwrapper
focusLockService.removeInertAttribute();
}
}));