Added so manager init is performed when blocks are created from the m…

…anager. Fixes #1420
PiranhaCMS · Dec 29, 2020 · 516c0da · 516c0da
1 parent 110f55c
commit 516c0da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/core/Piranha.Manager/Services/ContentTypeService.cs b/core/Piranha.Manager/Services/ContentTypeService.cs
@@ -270,7 +270,7 @@ public async Task<AsyncResult<BlockModel>> CreateBlockAsync(string type)
 
             if (blockType != null)
             {
-                var block = (Block)(await _factory.CreateBlockAsync(type));
+                var block = (Block)(await _factory.CreateBlockAsync(type, true));
 
                 if (block is BlockGroup)
                 {

diff --git a/core/Piranha/Services/ContentFactory.cs b/core/Piranha/Services/ContentFactory.cs
@@ -78,8 +78,9 @@ public Task<object> CreateDynamicRegionAsync(ContentTypeBase type, string region
         /// Creates and initializes a new block of the specified type.
         /// </summary>
         /// <param name="typeName">The type name</param>
+        /// <param name="managerInit">If manager initialization should be performed</param>
         /// <returns>The new block</returns>
-        public async Task<object> CreateBlockAsync(string typeName)
+        public async Task<object> CreateBlockAsync(string typeName, bool managerInit = false)
         {
             var blockType = App.Blocks.GetByType(typeName);
 
@@ -95,7 +96,7 @@ public async Task<object> CreateBlockAsync(string typeName)
                         if (typeof(Extend.IField).IsAssignableFrom(prop.PropertyType))
                         {
                             var field = Activator.CreateInstance(prop.PropertyType);
-                            await InitFieldAsync(scope, field, false).ConfigureAwait(false);
+                            await InitFieldAsync(scope, field, managerInit).ConfigureAwait(false);
                             prop.SetValue(block, field);
                         }
                     }

diff --git a/core/Piranha/Services/IContentFactory.cs b/core/Piranha/Services/IContentFactory.cs
@@ -36,8 +36,9 @@ public interface IContentFactory
         /// Creates and initializes a new block of the specified type.
         /// </summary>
         /// <param name="typeName">The type name</param>
+        /// <param name="managerInit">If manager initialization should be performed</param>
         /// <returns>The new block</returns>
-        Task<object> CreateBlockAsync(string typeName);
+        Task<object> CreateBlockAsync(string typeName, bool managerInit = false);
 
         /// <summary>
         /// Initializes the given model.