Skip to content

Commit 1d9992c

Browse files
committed
Fixed #30: Register page should not include TenancyName.
1 parent 9a733da commit 1d9992c

File tree

3 files changed

+6
-23
lines changed

3 files changed

+6
-23
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
using AbpCompanyName.AbpProjectName.Controllers;
2727
using AbpCompanyName.AbpProjectName.Identity;
2828
using AbpCompanyName.AbpProjectName.Sessions;
29-
using AbpCompanyName.AbpProjectName.Web.Startup;
3029
using AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.TenantChange;
3130
using Microsoft.AspNetCore.Identity;
3231

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Models/Account/RegisterViewModel.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11
using System.Collections.Generic;
22
using System.ComponentModel.DataAnnotations;
33
using System.Text.RegularExpressions;
4-
using AbpCompanyName.AbpProjectName.MultiTenancy;
5-
using AbpCompanyName.AbpProjectName.Users;
4+
using Abp.Authorization.Users;
65
using Abp.Extensions;
76
using AbpCompanyName.AbpProjectName.Authorization.Users;
87

98
namespace AbpCompanyName.AbpProjectName.Web.Models.Account
109
{
1110
public class RegisterViewModel : IValidatableObject
1211
{
13-
/// <summary>
14-
/// Not required for single-tenant applications.
15-
/// </summary>
16-
[StringLength(Tenant.MaxTenancyNameLength)]
17-
public string TenancyName { get; set; }
18-
1912
[Required]
20-
[StringLength(User.MaxNameLength)]
13+
[StringLength(AbpUserBase.MaxNameLength)]
2114
public string Name { get; set; }
2215

2316
[Required]
24-
[StringLength(User.MaxSurnameLength)]
17+
[StringLength(AbpUserBase.MaxSurnameLength)]
2518
public string Surname { get; set; }
2619

27-
[StringLength(User.MaxUserNameLength)]
20+
[StringLength(AbpUserBase.MaxUserNameLength)]
2821
public string UserName { get; set; }
2922

3023
[Required]
3124
[EmailAddress]
32-
[StringLength(User.MaxEmailAddressLength)]
25+
[StringLength(AbpUserBase.MaxEmailAddressLength)]
3326
public string EmailAddress { get; set; }
3427

35-
[StringLength(User.MaxPlainPasswordLength)]
28+
[StringLength(AbpUserBase.MaxPlainPasswordLength)]
3629
public string Password { get; set; }
3730

3831
public bool IsExternalLogin { get; set; }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/Register.cshtml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@
3636
</div>
3737
}
3838

39-
@if (ViewBag.IsMultiTenancyEnabled)
40-
{
41-
<div class="form-group">
42-
<div class="col-lg-12">
43-
<input type="text" class="form-control" name="TenancyName" placeholder="@L("TenancyName")" value="@Model.TenancyName" required maxlength="@AbpCompanyName.AbpProjectName.MultiTenancy.Tenant.MaxTenancyNameLength">
44-
</div>
45-
</div>
46-
}
47-
4839
<input type="hidden" name="IsExternalLogin" value="@Model.IsExternalLogin.ToString()" />
4940
<input type="hidden" name="ExternalLoginAuthSchema" value="@Model.ExternalLoginAuthSchema"/>
5041

0 commit comments

Comments
 (0)