Fix for #88

rickbutterfield · Jan 26, 2025 · e72d2c0 · e72d2c0
1 parent 942500e
commit e72d2c0
Show file tree

Hide file tree

Showing 17 changed files with 193 additions and 446 deletions.
diff --git a/src/Umbraco.Cms.15.x/Views/Partials/blockgrid/Components/heroBlock.cshtml b/src/Umbraco.Cms.15.x/Views/Partials/blockgrid/Components/heroBlock.cshtml
@@ -1,4 +1,4 @@
-@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem<HeroBlock>>
+@inherits UmbracoViewPage<BlockGridItem<HeroBlock, BlockSettings>>
 @{
     var backgroundColor = Model.Content.BackgroundColor;
     var image = Model.Content.Image;
@@ -7,6 +7,7 @@
 
 <pre>Dropdown: @Model.Content.Height</pre>
 <pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+<pre>Settings Dropdown: @Model.Settings?.Dropdown</pre>
 
 <div 
     class="hero"

diff --git a/src/Umbraco.Cms.15.x/uSync/v15/Content/home.config b/src/Umbraco.Cms.15.x/uSync/v15/Content/home.config
@@ -64,6 +64,22 @@
             "label": "ffffff",
             "value": "#ffffff"
           }
+        },
+        {
+          "alias": "contentPicker",
+          "culture": null,
+          "editorAlias": null,
+          "segment": null,
+          "value": "umb://document/6e2ff1f7114e484ba407918daded1aa6"
+        },
+        {
+          "alias": "height",
+          "culture": null,
+          "editorAlias": null,
+          "segment": null,
+          "value": [
+            "150"
+          ]
         }
       ]
     },
@@ -715,6 +731,28 @@
           }
         }
       ]
+    },
+    {
+      "contentTypeKey": "cb6adf93-9c01-476c-970b-7469474db5b4",
+      "key": "ac23ef75-48f0-4d56-b81c-ed6956695d06",
+      "udi": null,
+      "values": [
+        {
+          "alias": "dropdown",
+          "culture": null,
+          "editorAlias": null,
+          "segment": null,
+          "value": [
+            "100"
+          ]
+        }
+      ]
+    },
+    {
+      "contentTypeKey": "cb6adf93-9c01-476c-970b-7469474db5b4",
+      "key": "572d10a6-2bbb-4524-ba6e-d047c84ae620",
+      "udi": null,
+      "values": []
     }
   ],
   "expose": [
@@ -892,7 +930,7 @@
         "contentKey": "b41a910e-274a-43b9-be02-66aa5a7efafe",
         "contentUdi": null,
         "rowSpan": 1,
-        "settingsKey": null,
+        "settingsKey": "ac23ef75-48f0-4d56-b81c-ed6956695d06",
         "settingsUdi": null
       },
       {
@@ -1221,7 +1259,7 @@
         "contentKey": "dddae8d8-5034-4ab2-8a90-e6c15a60e657",
         "contentUdi": null,
         "rowSpan": 1,
-        "settingsKey": null,
+        "settingsKey": "572d10a6-2bbb-4524-ba6e-d047c84ae620",
         "settingsUdi": null
       }
     ]

diff --git a/src/Umbraco.Cms.15.x/uSync/v15/Content/nested-block-grid-test.config b/src/Umbraco.Cms.15.x/uSync/v15/Content/nested-block-grid-test.config
@@ -81,11 +81,37 @@
                       "label": "113635",
                       "value": "#113635"
                     }
+                  },
+                  {
+                    "alias": "height",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": [
+                      "150"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "settingsData": [
+              {
+                "contentTypeKey": "cb6adf93-9c01-476c-970b-7469474db5b4",
+                "key": "847d6da8-d847-42d8-9d9a-39398931c361",
+                "udi": null,
+                "values": [
+                  {
+                    "alias": "dropdown",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": [
+                      "200"
+                    ]
                   }
                 ]
               }
             ],
-            "settingsData": [],
             "expose": [
               {
                 "contentKey": "b9f61237-fbb9-4425-97c9-1bb67fb71451",
@@ -106,7 +132,7 @@
                   "contentKey": "b9f61237-fbb9-4425-97c9-1bb67fb71451",
                   "contentUdi": null,
                   "rowSpan": 1,
-                  "settingsKey": null,
+                  "settingsKey": "847d6da8-d847-42d8-9d9a-39398931c361",
                   "settingsUdi": null
                 }
               ]

diff --git a/src/Umbraco.Cms.15.x/uSync/v15/Content/test-1.config b/src/Umbraco.Cms.15.x/uSync/v15/Content/test-1.config
diff --git a/src/Umbraco.Cms.15.x/uSync/v15/Content/test.config b/src/Umbraco.Cms.15.x/uSync/v15/Content/test.config