Minor fixes on registration.

aspnetboilerplate · Dec 3, 2015 · fea7f8f · fea7f8f
1 parent ca6e4cd
commit fea7f8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/EventCloud.Web/Controllers/AccountController.cs b/src/EventCloud.Web/Controllers/AccountController.cs
@@ -213,8 +213,15 @@ public virtual async Task<ActionResult> Register(RegisterViewModel model)
                         }
                     };
 
-                    model.UserName = model.EmailAddress;
-                    model.Password = Users.User.CreateRandomPassword();
+                    if (string.IsNullOrWhiteSpace(model.UserName))
+                    {
+                        model.UserName = model.EmailAddress;
+                    }
+
+                    if (string.IsNullOrWhiteSpace(model.Password))
+                    {
+                        model.Password = Users.User.CreateRandomPassword();
+                    }
 
                     if (string.Equals(externalLoginInfo.Email, model.EmailAddress, StringComparison.InvariantCultureIgnoreCase))
                     {

diff --git a/src/EventCloud.Web/Views/Account/Register.cshtml b/src/EventCloud.Web/Views/Account/Register.cshtml
@@ -1,4 +1,6 @@
-@model EventCloud.Web.Models.Account.RegisterViewModel
+@using Abp.Extensions
+@using EventCloud.MultiTenancy
+@model EventCloud.Web.Models.Account.RegisterViewModel
 <div class="container entrance-container">
     <div id="LoginArea" class="row">
         <div class="col-lg-12">
@@ -19,7 +21,7 @@
                         {
                             <div class="form-group">
                                 <div class="col-lg-12">
-                                    <input type="text" class="form-control" name="TenancyName" placeholder="@L("TenancyName")" value="@Model.TenancyName" required maxlength="@EventCloud.MultiTenancy.Tenant.MaxTenancyNameLength">
+                                    <input type="text" class="form-control" name="TenancyName" placeholder="@L("TenancyName")" value="@(Model.TenancyName.IsNullOrWhiteSpace() ? Tenant.DefaultTenantName : Model.TenancyName)" required maxlength="@Tenant.MaxTenancyNameLength">
                                 </div>
                             </div>
                         }