Merge pull request #44 from idseefeld/bugs/41-after-umbraco-update-to-version-1540-the-wysiwyg-blog-grid-shows-error

fix issue 41

Author: idseefeld

…e/Views/Partials/blockgrid/~items.cshtml …s/Partials/blockgrid/backup-items.cshtmlsrc/wysiwgUmbracoCommunityExtensions.TestSite/Views/Partials/blockgrid/~items.cshtml renamed to src/wysiwgUmbracoCommunityExtensions.TestSite/Views/Partials/blockgrid/backup-items.cshtml src/wysiwgUmbracoCommunityExtensions.TestSite/Views/Partials/blockgrid/~items.cshtml renamed to src/wysiwgUmbracoCommunityExtensions.TestSite/Views/Partials/blockgrid/backup-items.cshtml

@@ -1,38 +1,30 @@
-@using Umbraco.Extensions
-@model IEnumerable<BlockGridItem>
+@using Umbraco.Cms.Core.Models.Blocks
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<IEnumerable<BlockGridItem>>
 @{
     if (Model?.Any() != true) { return; }
 }
 
 <div class="umb-block-grid__layout-container">
     @foreach (var item in Model)
     {
-        var areasTemplates = new List<string>();
-        for (var i = 1; i <= 20; i++)
-        {
-            areasTemplates.Add($"{WysiwgUmbracoCommunityExtensions.Constants.Prefix}layout{i}");
-        }
-        var alias = areasTemplates.InvariantContains(item.Content.ContentType.Alias)
-        ? BlockGridTemplateExtensions.DefaultItemAreasTemplate
-        : item.Content.ContentType.Alias;
-        var partialViewName = string.Concat(BlockGridTemplateExtensions.DefaultFolder, "Components/", alias.Replace(WysiwgUmbracoCommunityExtensions.Constants.Prefix,""));
 
         <div class="umb-block-grid__layout-item"
-             data-content-element-type-alias="@alias"
+             data-content-element-type-alias="@item.Content.ContentType.Alias"
              data-content-element-type-key="@item.Content.ContentType.Key"
              data-element-key="@item.ContentKey"
              data-col-span="@item.ColumnSpan"
              data-row-span="@item.RowSpan"
              style=" --umb-block-grid--item-column-span: @item.ColumnSpan; --umb-block-grid--item-row-span: @item.RowSpan; ">
             @{
+                var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias;
                 try
                 {
                     @await Html.PartialAsync(partialViewName, item)
                 }
                 catch (InvalidOperationException)
                 {
                     <p>
-                        <strong>Could not render component of type: @(alias)</strong>
+                        <strong>Could not render component of type: @(item.Content.ContentType.Alias)</strong>
                         <br />
                         This likely happened because the partial view <em>@partialViewName</em> could not be found.
                     </p>

src/wysiwgUmbracoCommunityExtensions.TestSite/Views/layout.cshtml

@@ -1,4 +1,4 @@
-@using Umbraco.Cms.Web.Common.PublishedModels;
+@using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<IMetaSeo>
 @{
     Layout = null;
@@ -68,4 +68,4 @@
 
     <script src="~/js/pictureloading.js?v=@v"></script>
 </body>
-</html>
+</html>

src/wysiwgUmbracoCommunityExtensions.TestSite/Views/root.cshtml

@@ -1,8 +1,8 @@
-@using Umbraco.Cms.Web.Common.PublishedModels;
+@using Umbraco.Cms.Web.Common.PublishedModels;
 @using WysiwgUmbracoCommunityExtensions.Models;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<RootPage>
 @{
     Layout = "layout.cshtml";
 }
 
-@await Html.GetBlockGridHtmlAsync(Model.Main)
+@await Html.GetBlockGridHtmlAsync(Model.Main)

src/wysiwgUmbracoCommunityExtensions.TestSite/Views/standardPage.cshtml

@@ -1,9 +1,9 @@
-@using Umbraco.Cms.Web.Common.PublishedModels;
+@using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<StandardPage>
 @{
     Layout = "layout.cshtml";
 }
 
 @await Html.GetBlockGridHtmlAsync(Model.Main)
 
-@await Html.GetBlockGridHtmlAsync(Model.SecondGrid)
+@await Html.GetBlockGridHtmlAsync(Model.SecondGrid)

src/wysiwgUmbracoCommunityExtensions.TestSite/appsettings.Development.json

@@ -17,10 +17,6 @@
       }
     ]
   },
-  "ConnectionStrings": {
-    "umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
-    "umbracoDbDSN_ProviderName": "Microsoft.Data.Sqlite"
-  },
   "Umbraco": {
     "CMS": {
       "ModelsBuilder": { "ModelsMode": "SourceCodeManual" },