Merge pull request #71 from sitegeist/task/upgradeNodeStructures

TASK: Upgrade nodetype structure
sitegeist · Jan 19, 2022 · c54f0a9 · c54f0a9
2 parents f8edc41 + d7161ee
commit c54f0a9
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 27 deletions.
diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Collection/Content.Main.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Collection/Content.Main.yaml
@@ -5,4 +5,4 @@
     nodeTypes:
       '*': false
       'Neos.Neos:Document': false
-      'Vendor.WheelInventor:Constraint.Content.Main': true
+      'Vendor.WheelInventor:Content.Text': true
diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Constraint/Content.Main.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Constraint/Content.Main.yaml
diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Constraint/Document.Restricted.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Constraint/Document.Restricted.yaml
diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Content/Text.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Content/Text.yaml
@@ -1,7 +1,6 @@
 'Vendor.WheelInventor:Content.Text':
   superTypes:
     'Vendor.WheelInventor:Content': true
-    'Vendor.WheelInventor:Constraint.Content.Main': true
   ui:
     icon: align-justify
     label: i18n

diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/Document.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/Document.yaml
@@ -7,5 +7,4 @@
     nodeTypes:
       '*': false
       'Neos.Neos:Document': false
-      'Vendor.WheelInventor:Document': true
-      'Vendor.WheelInventor:Constraint.Document.Restricted': false
+
diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/Error.404.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/Error.404.yaml
@@ -1,16 +1,9 @@
 'Vendor.WheelInventor:Document.Error.404':
   superTypes:
-    'Vendor.WheelInventor:Document': true
-    'Vendor.WheelInventor:Constraint.Document.Restricted': true
+    'Vendor.WheelInventor:Document.WebPage.Restricted': true
   ui:
     icon: exclamation-triangle
     label: i18n
-  childNodes:
-    main:
-      type: 'Neos.Neos:ContentCollection'
-      constraints:
-        nodeTypes:
-          '*': false
   properties:
     title:
       defaultValue: '404'

diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/HomePage.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/HomePage.yaml
@@ -1,7 +1,6 @@
 'Vendor.WheelInventor:Document.HomePage':
   superTypes:
-    'Vendor.WheelInventor:Document.LandingPage': true
-    'Vendor.WheelInventor:Constraint.Document.Restricted': true
+    'Vendor.WheelInventor:Document.WebPage.Restricted': true
   ui:
     icon: globe
     label: i18n

diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/LandingPage.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/LandingPage.yaml
diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/WebPage.Restricted.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/WebPage.Restricted.yaml
@@ -0,0 +1,4 @@
+'Vendor.WheelInventor:Document.WebPage.Restricted':
+  abstract: true
+  superTypes:
+    'Vendor.WheelInventor:Document.WebPage': true
diff --git a/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/WebPage.yaml b/DistributionPackages/Vendor.WheelInventor/NodeTypes/Document/WebPage.yaml
@@ -9,7 +9,7 @@
     nodeTypes:
       'Vendor.WheelInventor:Document.WebPage': true
       'Vendor.WheelInventor:Document.Shortcut': true
-
+      'Vendor.WheelInventor:Document.WebPage.Restricted': false
   childNodes:
     main:
       type: 'Vendor.WheelInventor:Collection.Content.Main'
diff --git a/...ges/Vendor.WheelInventor/Resources/Private/Fusion/Integration/Document/LandingPage.fusion b/...ges/Vendor.WheelInventor/Resources/Private/Fusion/Integration/Document/LandingPage.fusion