From a3217a73d3e9952eff5ab30051fe79fe272ae165 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 3 Oct 2018 15:15:43 +0100
Subject: [PATCH] we need to NOT have umb-isolate-form or val-form-manager on
 the umb-editor-sub-view when its core's own content apps

---
 .../editor/umb-editor-sub-view.html           | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html
index 4991ff9dde..ba9f70a9e6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html
@@ -1,14 +1,29 @@
 <div class="umb-editor-sub-view"
-     ng-class="'sub-view-' + model.name"
-     val-sub-view>
+    ng-class="'sub-view-' + model.name"
+    val-sub-view>
+
+    <!-- User definied content apps -->
+    <div ng-switch="model.alias">
+        <ng-form ng-switch-when="umbContent|umbInfo" ng-switch-when-separator="|" val-form-manager>
+            <div
+                class="umb-editor-sub-view__content"
+                ng-show="model.active === true"
+                ng-include="model.view">
+            </div>
+        </ng-form>
+
+        <!-- Custom Content Apps -->
+        <ng-form ng-switch-default val-form-manager umb-isolate-form>
+            <div
+                class="umb-editor-sub-view__content"
+                ng-show="model.active === true"
+                ng-include="model.view">
+            </div>
+        </ng-form>
+    </div>
+
+
 
-     <ng-form val-form-manager umb-isolate-form>
-        <div
-            class="umb-editor-sub-view__content"
-            ng-show="model.active === true"
-            ng-include="model.view">
-        </div>
-     </ng-form>
 
 
 </div>