Skip to content

Commit fea7f8f

Browse files
committed
Minor fixes on registration.
1 parent ca6e4cd commit fea7f8f

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

src/EventCloud.Web/Controllers/AccountController.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,15 @@ public virtual async Task<ActionResult> Register(RegisterViewModel model)
213213
}
214214
};
215215

216-
model.UserName = model.EmailAddress;
217-
model.Password = Users.User.CreateRandomPassword();
216+
if (string.IsNullOrWhiteSpace(model.UserName))
217+
{
218+
model.UserName = model.EmailAddress;
219+
}
220+
221+
if (string.IsNullOrWhiteSpace(model.Password))
222+
{
223+
model.Password = Users.User.CreateRandomPassword();
224+
}
218225

219226
if (string.Equals(externalLoginInfo.Email, model.EmailAddress, StringComparison.InvariantCultureIgnoreCase))
220227
{

src/EventCloud.Web/Views/Account/Register.cshtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
@model EventCloud.Web.Models.Account.RegisterViewModel
1+
@using Abp.Extensions
2+
@using EventCloud.MultiTenancy
3+
@model EventCloud.Web.Models.Account.RegisterViewModel
24
<div class="container entrance-container">
35
<div id="LoginArea" class="row">
46
<div class="col-lg-12">
@@ -19,7 +21,7 @@
1921
{
2022
<div class="form-group">
2123
<div class="col-lg-12">
22-
<input type="text" class="form-control" name="TenancyName" placeholder="@L("TenancyName")" value="@Model.TenancyName" required maxlength="@EventCloud.MultiTenancy.Tenant.MaxTenancyNameLength">
24+
<input type="text" class="form-control" name="TenancyName" placeholder="@L("TenancyName")" value="@(Model.TenancyName.IsNullOrWhiteSpace() ? Tenant.DefaultTenantName : Model.TenancyName)" required maxlength="@Tenant.MaxTenancyNameLength">
2325
</div>
2426
</div>
2527
}

0 commit comments

Comments
 (0)