Adds the required hidden form field to CheckBoxFor(), resolves #68

daveaglick · Nov 29, 2016 · 09bf217 · 09bf217
1 parent 282ea75
commit 09bf217
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 14 deletions.
diff --git a/FluentBootstrap.Mvc/FluentBootstrap.Mvc.csproj b/FluentBootstrap.Mvc/FluentBootstrap.Mvc.csproj
@@ -73,6 +73,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Forms\CheckBoxFor.cs" />
     <Compile Include="Forms\FormControlFor.cs" />
     <Compile Include="Forms\FormControlForBase.cs" />
     <Compile Include="Forms\FormControlListFor.cs" />

diff --git a/FluentBootstrap.Mvc/Forms/CheckBoxFor.cs b/FluentBootstrap.Mvc/Forms/CheckBoxFor.cs
@@ -0,0 +1,47 @@
+using System;
+using System.IO;
+using System.Linq.Expressions;
+using System.Web.Mvc;
+using System.Web.Mvc.Html;
+using FluentBootstrap.Mvc.Internals;
+
+namespace FluentBootstrap.Mvc.Forms
+{
+    public class CheckBoxFor<TModel, TValue> : Component
+    {
+        private readonly Expression<Func<TModel, TValue>> _expression;
+        private readonly bool _isNameInLabel;
+        private string _name;
+
+        internal CheckBoxFor(BootstrapHelper helper, Expression<Func<TModel, TValue>> expression, bool isNameInLabel = true)
+            : base(helper)
+        {
+            _expression = expression;
+            _isNameInLabel = isNameInLabel;
+        }
+
+        protected override void OnStart(TextWriter writer)
+        {
+            base.OnStart(writer);
+
+            ModelMetadata metadata = ModelMetadata.FromLambdaExpression(_expression, this.GetHtmlHelper<TModel>().ViewData);
+            string expressionText = ExpressionHelper.GetExpressionText(_expression);
+            _name = MvcFormExtensions.GetControlName(this.GetHelper<TModel>(), expressionText);
+            string label = MvcFormExtensions.GetControlLabel(metadata, expressionText);
+            bool isChecked = false;
+            if (metadata.Model == null || !bool.TryParse(metadata.Model.ToString(), out isChecked))
+            {
+                isChecked = false;
+            }
+            writer.Write(_isNameInLabel 
+                ? GetHelper().CheckBox(_name, label, null, isChecked).AddAttribute("value", isChecked)
+                : GetHelper().CheckBox(_name, null, label, isChecked).AddAttribute("value", isChecked));
+        }
+
+        protected override void OnFinish(TextWriter writer)
+        {
+            writer.Write(GetHelper().Hidden(_name, false));
+            base.OnFinish(writer);
+        }
+    }
+}
diff --git a/FluentBootstrap.Mvc/Forms/HiddenFor.cs b/FluentBootstrap.Mvc/Forms/HiddenFor.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Web.Mvc.Html;
+using FluentBootstrap.Forms;
 using FluentBootstrap.Mvc.Internals;
 
 namespace FluentBootstrap.Mvc.Forms

diff --git a/FluentBootstrap.Mvc/Forms/MvcFormExtensions.cs b/FluentBootstrap.Mvc/Forms/MvcFormExtensions.cs
@@ -277,22 +277,13 @@ public static ComponentBuilder<MvcBootstrapConfig<TModel>, Input> PasswordFor<TC
             return helper.Input(name, label, null, null, FormInputType.Password);
         }
 
-        public static ComponentBuilder<MvcBootstrapConfig<TModel>, CheckedControl> CheckBoxFor<TComponent, TModel, TValue>(
+        public static ComponentBuilder<MvcBootstrapConfig<TModel>, CheckBoxFor<TModel, TValue>> CheckBoxFor<TComponent, TModel, TValue>(
             this BootstrapHelper<MvcBootstrapConfig<TModel>, TComponent> helper, Expression<Func<TModel, TValue>> expression, bool isNameInLabel = true)
             where TComponent : Component, ICanCreate<CheckedControl>
         {
-            ModelMetadata metadata = ModelMetadata.FromLambdaExpression(expression, helper.GetConfig().HtmlHelper.ViewData);
-            string expressionText = ExpressionHelper.GetExpressionText(expression);
-            string name = GetControlName(helper, expressionText);
-            string label = GetControlLabel(metadata, expressionText);
-            bool isChecked = false;
-            if (metadata.Model == null || !bool.TryParse(metadata.Model.ToString(), out isChecked))
-            {
-                isChecked = false;
-            }
-            return isNameInLabel ? helper.CheckBox(name, label, null, isChecked) : helper.CheckBox(name, null, label, isChecked);
+            return new ComponentBuilder<MvcBootstrapConfig<TModel>, CheckBoxFor<TModel, TValue>>(helper.GetConfig(), new CheckBoxFor<TModel, TValue>(helper, expression, isNameInLabel));
         }
-        
+
         public static ComponentBuilder<MvcBootstrapConfig<TModel>, CheckedControl> RadioFor<TComponent, TModel, TValue>(
             this BootstrapHelper<MvcBootstrapConfig<TModel>, TComponent> helper, Expression<Func<TModel, TValue>> expression, object value = null, bool isNameInLabel = true)
             where TComponent : Component, ICanCreate<CheckedControl>
@@ -429,13 +420,13 @@ private static ComponentBuilder<MvcBootstrapConfig<TModel>, ControlLabel> GetCon
             return new MvcBootstrapHelper<TModel>(helper.GetConfig().HtmlHelper).ControlLabel(label).For(TagBuilder.CreateSanitizedId(name));
         }
 
-        private static string GetControlName<TComponent, TModel>(BootstrapHelper<MvcBootstrapConfig<TModel>, TComponent> helper, string expressionText)
+        internal static string GetControlName<TComponent, TModel>(BootstrapHelper<MvcBootstrapConfig<TModel>, TComponent> helper, string expressionText)
             where TComponent : Component
         {
             return helper.GetConfig().HtmlHelper.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName(expressionText);
         }
 
-        private static string GetControlLabel(ModelMetadata metadata, string expressionText)
+        internal static string GetControlLabel(ModelMetadata metadata, string expressionText)
         {
             string label = metadata.DisplayName;
             if (label == null)