#104 - handle missing form property

kjac · Dec 20, 2016 · f9a4eb7 · f9a4eb7
1 parent d8b6f40
commit f9a4eb7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/Source/Umbraco/Views/Partials/FormEditor/Async.cshtml b/Source/Umbraco/Views/Partials/FormEditor/Async.cshtml
@@ -10,9 +10,16 @@
   // get the name of the form model property on the content type (defaults to "form")
   var formPropertyName = ViewBag.FormName as string ?? "form";
 
-  // get the form model (named "form" on the content type)
+  // get the form model
   var form = formContent.GetPropertyValue<FormModel>(formPropertyName);
 
+  // #104 - don't break the site if the form model could not be found
+  if(form == null)
+  {
+    @: <!-- no Form Editor form was found on the page -->
+    return;
+  }
+
   // attempt to load an existing submission if ViewBag.FormRowId is defined
   if(ViewBag.FormRowId is string)
   {

diff --git a/Source/Umbraco/Views/Partials/FormEditor/NoScript.cshtml b/Source/Umbraco/Views/Partials/FormEditor/NoScript.cshtml
@@ -10,6 +10,13 @@
   // get the form model
   var form = formContent.GetPropertyValue<FormModel>(formPropertyName);
 
+  // #104 - don't break the site if the form model could not be found
+  if(form == null)
+  {
+    @: <!-- no Form Editor form was found on the page -->
+    return;
+  }
+
   // attempt to load an existing submission if ViewBag.FormRowId is defined
   if(ViewBag.FormRowId is string)
   {

diff --git a/Source/Umbraco/Views/Partials/FormEditor/Sync.cshtml b/Source/Umbraco/Views/Partials/FormEditor/Sync.cshtml
@@ -11,6 +11,13 @@
   // get the form model
   var form = formContent.GetPropertyValue<FormModel>(formPropertyName);
 
+  // #104 - don't break the site if the form model could not be found
+  if(form == null)
+  {
+    @: <!-- no Form Editor form was found on the page -->
+    return;
+  }
+
   // attempt to load an existing submission if ViewBag.FormRowId is defined
   if(ViewBag.FormRowId is string)
   {