Skip to content

Commit b5c18c9

Browse files
committed
More code cleanup
1 parent 8eb2944 commit b5c18c9

File tree

81 files changed

+238
-209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+238
-209
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using Abp.Application.Services;
55
using Abp.IdentityFramework;
66
using Abp.Runtime.Session;
7-
using AbpCompanyName.AbpProjectName.MultiTenancy;
87
using AbpCompanyName.AbpProjectName.Authorization.Users;
8+
using AbpCompanyName.AbpProjectName.MultiTenancy;
99

1010
namespace AbpCompanyName.AbpProjectName
1111
{

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ public override void Initialize()
2121

2222
IocManager.RegisterAssemblyByConvention(thisAssembly);
2323

24-
Configuration.Modules.AbpAutoMapper().Configurators.Add(cfg =>
25-
{
24+
Configuration.Modules.AbpAutoMapper().Configurators.Add(
2625
// Scan the assembly for classes which inherit from AutoMapper.Profile
27-
cfg.AddProfiles(thisAssembly);
28-
});
26+
cfg => cfg.AddProfiles(thisAssembly)
27+
);
2928
}
3029
}
3130
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/Accounts/Dto/RegisterInput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
4040
{
4141
if (!UserName.Equals(EmailAddress) && ValidationHelper.IsEmail(UserName))
4242
{
43-
yield return new ValidationResult("Username cannot be an email address unless it's same with your email address !");
43+
yield return new ValidationResult("Username cannot be an email address unless it's the same as your email address!");
4444
}
4545
}
4646
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/CreateRoleDto.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using System.Collections.Generic;
22
using System.ComponentModel.DataAnnotations;
3+
using Abp.Authorization.Roles;
34
using Abp.AutoMapper;
45
using AbpCompanyName.AbpProjectName.Authorization.Roles;
56

6-
using Abp.Authorization.Roles;
7-
87
namespace AbpCompanyName.AbpProjectName.Roles.Dto
98
{
109
[AutoMapTo(typeof(Role))]

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
2-
using System.Threading.Tasks;
32
using System.Linq;
3+
using System.Threading.Tasks;
44
using Microsoft.AspNetCore.Identity;
55
using Microsoft.EntityFrameworkCore;
66
using Abp.Application.Services;
@@ -9,9 +9,9 @@
99
using Abp.Domain.Repositories;
1010
using Abp.IdentityFramework;
1111
using Abp.UI;
12+
using AbpCompanyName.AbpProjectName.Authorization;
1213
using AbpCompanyName.AbpProjectName.Authorization.Roles;
1314
using AbpCompanyName.AbpProjectName.Authorization.Users;
14-
using AbpCompanyName.AbpProjectName.Authorization;
1515
using AbpCompanyName.AbpProjectName.Roles.Dto;
1616

1717
namespace AbpCompanyName.AbpProjectName.Roles

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
2-
using System.Threading.Tasks;
32
using System.Linq;
3+
using System.Threading.Tasks;
44
using Microsoft.AspNetCore.Identity;
55
using Microsoft.EntityFrameworkCore;
66
using Abp.Application.Services;
@@ -9,10 +9,10 @@
99
using Abp.Domain.Repositories;
1010
using Abp.IdentityFramework;
1111
using AbpCompanyName.AbpProjectName.Authorization;
12-
using AbpCompanyName.AbpProjectName.Authorization.Users;
1312
using AbpCompanyName.AbpProjectName.Authorization.Roles;
14-
using AbpCompanyName.AbpProjectName.Users.Dto;
13+
using AbpCompanyName.AbpProjectName.Authorization.Users;
1514
using AbpCompanyName.AbpProjectName.Roles.Dto;
15+
using AbpCompanyName.AbpProjectName.Users.Dto;
1616

1717
namespace AbpCompanyName.AbpProjectName.Users
1818
{

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Roles/AppRoleConfig.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,18 @@ public static void Configure(IRoleManagementConfig roleManagementConfig)
1212
roleManagementConfig.StaticRoles.Add(
1313
new StaticRoleDefinition(
1414
StaticRoleNames.Host.Admin,
15-
MultiTenancySides.Host)
16-
);
15+
MultiTenancySides.Host
16+
)
17+
);
1718

1819
// Static tenant roles
1920

2021
roleManagementConfig.StaticRoles.Add(
2122
new StaticRoleDefinition(
2223
StaticRoleNames.Tenants.Admin,
23-
MultiTenancySides.Tenant)
24-
);
24+
MultiTenancySides.Tenant
25+
)
26+
);
2527
}
2628
}
2729
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-es.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@
4444
<text name="Logout" value="Cerrar sesión" />
4545

4646
</texts>
47-
</localizationDictionary>
47+
</localizationDictionary>

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-fr.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@
4444
<text name="Logout" value="Déconnexion" />
4545

4646
</texts>
47-
</localizationDictionary>
47+
</localizationDictionary>

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-it.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@
5454
<text name="No" value="No" />
5555
<text name="Optional" value="Opzionale" />
5656
</texts>
57-
</localizationDictionary>
57+
</localizationDictionary>

0 commit comments

Comments
 (0)