#104 - add more handling of empty/missing forms

kjac · Dec 21, 2016 · 070bf45 · 070bf45
1 parent f9a4eb7
commit 070bf45
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/Source/Solution/FormEditor/FormModel.cs b/Source/Solution/FormEditor/FormModel.cs
@@ -345,6 +345,11 @@ public FieldValueFrequencyStatistics<IStatisticsField> GetFieldValueFrequencySta
 			return result;
 		}
 
+		public bool IsEmpty()
+		{
+			return Pages == null;
+		}
+
 		private HttpRequest Request
 		{
 			get { return HttpContext.Current.Request; }

diff --git a/Source/Umbraco/Views/Partials/FormEditor/Async.cshtml b/Source/Umbraco/Views/Partials/FormEditor/Async.cshtml
@@ -13,8 +13,8 @@
   // 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)
+  // #104 - don't attempt to render the form if the form model does not exist on the page or if it is empty
+  if(form == null || form.IsEmpty())
   {
     @: <!-- no Form Editor form was found on the page -->
     return;
@@ -24,9 +24,9 @@
   if(ViewBag.FormRowId is string)
   {
     Guid rowId;
-    if(Guid.TryParse((string) ViewBag.FormRowId, out rowId))
+    if(Guid.TryParse((string)ViewBag.FormRowId, out rowId))
     {
-      form.LoadValues(formContent, rowId);      
+      form.LoadValues(formContent, rowId);
     }
   }
 

diff --git a/Source/Umbraco/Views/Partials/FormEditor/NoScript.cshtml b/Source/Umbraco/Views/Partials/FormEditor/NoScript.cshtml
@@ -6,12 +6,12 @@
 
   // 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
   var form = formContent.GetPropertyValue<FormModel>(formPropertyName);
 
-  // #104 - don't break the site if the form model could not be found
-  if(form == null)
+  // #104 - don't attempt to render the form if the form model does not exist on the page or if it is empty
+  if(form == null || form.IsEmpty())
   {
     @: <!-- no Form Editor form was found on the page -->
     return;
@@ -26,7 +26,7 @@
       form.LoadValues(formContent, rowId);
     }
   }
-  
+
   // handle form submission if this is a postback
   // - this will also take care of redirecting to the success page (if configured)
   var formWasSubmitted = form.CollectSubmittedValues(formContent);

diff --git a/Source/Umbraco/Views/Partials/FormEditor/Sync.cshtml b/Source/Umbraco/Views/Partials/FormEditor/Sync.cshtml
@@ -7,12 +7,12 @@
 
   // 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
   var form = formContent.GetPropertyValue<FormModel>(formPropertyName);
 
-  // #104 - don't break the site if the form model could not be found
-  if(form == null)
+  // #104 - don't attempt to render the form if the form model does not exist on the page or if it is empty 
+  if(form == null || form.IsEmpty())
   {
     @: <!-- no Form Editor form was found on the page -->
     return;
@@ -27,7 +27,7 @@
       form.LoadValues(formContent, rowId);
     }
   }
-  
+
   // handle form submission if this is a postback
   // - this will also take care of redirecting to the success page (if configured)
   var formWasSubmitted = form.CollectSubmittedValues(formContent);