Skip to content

Commit 3da38ec

Browse files
committed
Fixed Tenants and User controller.
1 parent a04d093 commit 3da38ec

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

angular/yarn.lock

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,12 @@
149149
dependencies:
150150
"@types/jquery" "*"
151151

152+
"@types/jquery.validation@^1.16.3":
153+
version "1.16.3"
154+
resolved "https://registry.yarnpkg.com/@types/jquery.validation/-/jquery.validation-1.16.3.tgz#32cb17657a866c54a145988f1768d4ed31d1b986"
155+
dependencies:
156+
"@types/jquery" "*"
157+
152158
"@types/jquery@*", "@types/jquery@^2.0.41":
153159
version "2.0.41"
154160
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.41.tgz#b87ba051011f99edbe586d8f97282e7786e01a6d"
@@ -3512,6 +3518,10 @@ ngx-bootstrap@^1.6.6:
35123518
dependencies:
35133519
moment "2.18.1"
35143520

3521+
ngx-pagination@^3.0.0:
3522+
version "3.0.1"
3523+
resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-3.0.1.tgz#5a8000e40c0424d9c41c9d6d592562e1547abf24"
3524+
35153525
no-case@^2.2.0:
35163526
version "2.3.1"
35173527
resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Abp.AspNetCore.Mvc.Authorization;
1+
using Abp.Application.Services.Dto;
2+
using Abp.AspNetCore.Mvc.Authorization;
23
using AbpCompanyName.AbpProjectName.Authorization;
34
using AbpCompanyName.AbpProjectName.Controllers;
45
using AbpCompanyName.AbpProjectName.MultiTenancy;
@@ -18,7 +19,7 @@ public TenantsController(ITenantAppService tenantAppService)
1819

1920
public ActionResult Index()
2021
{
21-
var output = _tenantAppService.GetTenants();
22+
var output = _tenantAppService.GetAll(new PagedResultRequestDto());
2223
return View(output);
2324
}
2425
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Threading.Tasks;
2+
using Abp.Application.Services.Dto;
23
using Abp.AspNetCore.Mvc.Authorization;
34
using AbpCompanyName.AbpProjectName.Authorization;
45
using AbpCompanyName.AbpProjectName.Controllers;
@@ -19,7 +20,7 @@ public UsersController(IUserAppService userAppService)
1920

2021
public async Task<ActionResult> Index()
2122
{
22-
var output = await _userAppService.GetUsers();
23+
var output = await _userAppService.GetAll(new PagedResultRequestDto());
2324
return View(output);
2425
}
2526
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Tenants/Index.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@using Abp.MultiTenancy
33
@using AbpCompanyName.AbpProjectName.MultiTenancy
44
@using AbpCompanyName.AbpProjectName.Web.Startup
5-
@model Abp.Application.Services.Dto.ListResultDto<AbpCompanyName.AbpProjectName.MultiTenancy.Dto.TenantListDto>
5+
@model Abp.Application.Services.Dto.ListResultDto<AbpCompanyName.AbpProjectName.MultiTenancy.Dto.TenantDto>
66
@{
77
ViewBag.CurrentPageName = PageNames.Tenants; //The menu item will be active for this page.
88
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Users/Index.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@using Abp.Authorization.Users
22
@using AbpCompanyName.AbpProjectName.Web.Startup
3-
@model Abp.Application.Services.Dto.ListResultDto<AbpCompanyName.AbpProjectName.Users.Dto.UserListDto>
3+
@model Abp.Application.Services.Dto.ListResultDto<AbpCompanyName.AbpProjectName.Users.Dto.UserDto>
44
@{
55
ViewBag.CurrentPageName = PageNames.Users; //The menu item will be active for this page.
66
}

0 commit comments

Comments
 (0)