From d2ed21d60d1da81b1bc9d3809f2cc34bcc5cebdd Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 30 Jul 2018 16:07:34 +0300
Subject: [PATCH] textarea example

---
 .../TagHelpers/Form/AbpInputTagHelperService.cs             | 2 +-
 .../TagHelpers/Form/SelectItems.cs                          | 1 +
 .../Pages/Components/DynamicForms.cshtml                    | 6 ++++++
 .../Pages/Components/DynamicForms.cshtml.cs                 | 5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
index f54060bbfc..474ff2493c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
@@ -189,7 +189,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
             tagHelperOutput.TagName = "textarea";
             tagHelperOutput.TagMode = TagMode.StartTagAndEndTag;
-            tagHelperOutput.Content.SetContent(TagHelper.AspFor.ModelExplorer.Model.ToString());
+            tagHelperOutput.Content.SetContent(TagHelper.AspFor.ModelExplorer.Model?.ToString());
             if (textAreaAttribute.Rows>0)
             {
                 tagHelperOutput.Attributes.Add("rows", textAreaAttribute.Rows);
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/SelectItems.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/SelectItems.cs
index 4b281770fd..3e7ed57376 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/SelectItems.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/SelectItems.cs
@@ -31,6 +31,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 }
             }
 
+            // ReSharper disable once AssignNullToNotNullAttribute
             var selectItems = (properties.First().Model as IEnumerable<SelectListItem>).ToList();
             
             return selectItems;
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml
index 87d4c75a84..bd6c433211 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml
@@ -51,6 +51,7 @@
         <h5>Posted Values:</h5>
         <div>
             Name: @Model.PersonInput.Name <br />
+            Surname: @Model.PersonInput.Surname <br />
             City: @Model.PersonInput.City <br />
             Phone.Name: @Model.PersonInput.Phone.Name <br />
             Phone.Number: @Model.PersonInput.Phone.Number <br />
@@ -79,6 +80,7 @@
         <h5>Posted Values:</h5>
         <div>
             Name: @Model.PersonInput.Name <br />
+            Surname: @Model.PersonInput.Surname <br />
             City: @Model.PersonInput.City <br />
             Phone.Name: @Model.PersonInput.Phone.Name <br />
             Phone.Number: @Model.PersonInput.Phone.Number <br />
@@ -100,6 +102,7 @@
     <div class="demo-area">
         <form method="post">
             <abp-input asp-for="@Model.PersonInput.Name" />
+            <abp-input asp-for="@Model.PersonInput.Surname" />
             <abp-input asp-for="@Model.PersonInput.Age" />
             <abp-input asp-for="@Model.PersonInput.IsActive" />
             <abp-input asp-for="@Model.PersonInput.Day" />
@@ -113,6 +116,7 @@
         <h5>Posted Values:</h5>
         <div>
             Name: @Model.PersonInput.Name <br />
+            Surname: @Model.PersonInput.Surname <br />
             Age: @Model.PersonInput.Age <br />
             Is Active: @Model.PersonInput.IsActive <br />
             Day: @Model.PersonInput.Day <br />
@@ -126,6 +130,7 @@
         <pre>
 &lt;form method=&quot;post&quot;&gt;
     &lt;abp-input asp-for=&quot;Model.PersonInput.Name&quot; /&gt;
+    &lt;abp-input asp-for=&quot;Model.PersonInput.Surname&quot; /&gt;
     &lt;abp-input asp-for=&quot;Model.PersonInput.Age&quot; /&gt;
     &lt;abp-input asp-for=&quot;Model.PersonInput.IsActive&quot; /&gt;
     &lt;abp-input asp-for=&quot;Model.PersonInput.Day&quot; /&gt;
@@ -151,6 +156,7 @@
         <h5>Posted Values:</h5>
         <div>
             Name: @Model.PersonInput.Name <br />
+            Name: @Model.PersonInput.Surname <br />
             City: @Model.PersonInput.City <br />
             Phone.Name: @Model.PersonInput.Phone.Name <br />
             Phone.Number: @Model.PersonInput.Phone.Number <br />
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs
index 6422b374b2..2901ade738 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs
@@ -47,9 +47,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Pages.Components
         {
             [Required]
             [DisplayName("Name")]
-            [TextArea]
             public string Name { get; set; }
 
+            [DisplayName("Surname")]
+            [TextArea(Rows = 4)]
+            public string Surname { get; set; }
+
             [Required]
             [DisplayName("Age")]
             [Range(1, 100)]