lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/1.10.x' into dev

Browse Source 
# Conflicts:
#	src/Orchard/Data/Migration/AutomaticDataMigrations.cs
This commit is contained in:
Sebastien Ros
2016-10-17 14:40:54 -07:00
parent ca9fb77d8a 59a9f0bf03
commit 5c430ef7d1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.DesignerTools/Handlers/ShapeTracingSiteSettingsPartHandler.cs
-1
View File
@@ -28,7 +28,6 @@ namespace Orchard.DesignerTools.Handlers {
base.GetItemMetadata(context); base.GetItemMetadata(context);
var groupInfo = new GroupInfo(T("Shape Tracing")); var groupInfo = new GroupInfo(T("Shape Tracing"));
groupInfo.Id = "ShapeTracing";
context.Metadata.EditorGroupInfo.Add(groupInfo); context.Metadata.EditorGroupInfo.Add(groupInfo);
} }
src/Orchard/Data/Migration/AutomaticDataMigrations.cs
+4 -1
View File
@@ -80,7 +80,8 @@ namespace Orchard.Data.Migration {
/// <summary> /// <summary>
/// This ensures that the framework migrations have run for the distributed locking feature, as existing Orchard installations will not have the required tables when upgrading. /// This ensures that the framework migrations have run for the distributed locking feature, as existing Orchard installations will not have the required tables when upgrading.
/// </summary> /// </summary>
private void EnsureDistributedLockSchemaExists() { private void EnsureDistributedLockSchemaExists()
{
// Ensure the distributed lock record schema exists. // Ensure the distributed lock record schema exists.
var schemaBuilder = new SchemaBuilder(_dataMigrationInterpreter); var schemaBuilder = new SchemaBuilder(_dataMigrationInterpreter);
var distributedLockSchemaBuilder = new DistributedLockSchemaBuilder(_shellSettings, schemaBuilder); var distributedLockSchemaBuilder = new DistributedLockSchemaBuilder(_shellSettings, schemaBuilder);
@@ -93,6 +94,8 @@ namespace Orchard.Data.Migration {
return; return;
} }
distributedLockSchemaBuilder.CreateSchema();
distributedLockSchemaBuilder.CreateSchema(); distributedLockSchemaBuilder.CreateSchema();
_transactionManager.RequireNew(); _transactionManager.RequireNew();
} }