Browse Source
Merge pull request #10013 from muratyuceer/muratyuceer/tenantswitchmodal
make methods virtual to be overridable
pull/10020/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6 additions and
6 deletions
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/AbpTenantAppService.cs
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/AbpTenantController.cs
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs
|
|
|
@ -15,7 +15,7 @@ namespace Pages.Abp.MultiTenancy |
|
|
|
TenantStore = tenantStore; |
|
|
|
} |
|
|
|
|
|
|
|
public async Task<FindTenantResultDto> FindTenantByNameAsync(string name) |
|
|
|
public virtual async Task<FindTenantResultDto> FindTenantByNameAsync(string name) |
|
|
|
{ |
|
|
|
var tenant = await TenantStore.FindAsync(name); |
|
|
|
|
|
|
|
@ -33,7 +33,7 @@ namespace Pages.Abp.MultiTenancy |
|
|
|
}; |
|
|
|
} |
|
|
|
|
|
|
|
public async Task<FindTenantResultDto> FindTenantByIdAsync(Guid id) |
|
|
|
public virtual async Task<FindTenantResultDto> FindTenantByIdAsync(Guid id) |
|
|
|
{ |
|
|
|
var tenant = await TenantStore.FindAsync(id); |
|
|
|
|
|
|
|
|
|
|
|
@ -21,14 +21,14 @@ namespace Pages.Abp.MultiTenancy |
|
|
|
|
|
|
|
[HttpGet] |
|
|
|
[Route("tenants/by-name/{name}")] |
|
|
|
public async Task<FindTenantResultDto> FindTenantByNameAsync(string name) |
|
|
|
public virtual async Task<FindTenantResultDto> FindTenantByNameAsync(string name) |
|
|
|
{ |
|
|
|
return await _abpTenantAppService.FindTenantByNameAsync(name); |
|
|
|
} |
|
|
|
|
|
|
|
[HttpGet] |
|
|
|
[Route("tenants/by-id/{id}")] |
|
|
|
public async Task<FindTenantResultDto> FindTenantByIdAsync(Guid id) |
|
|
|
public virtual async Task<FindTenantResultDto> FindTenantByIdAsync(Guid id) |
|
|
|
{ |
|
|
|
return await _abpTenantAppService.FindTenantByIdAsync(id); |
|
|
|
} |
|
|
|
|
|
|
|
@ -28,7 +28,7 @@ namespace Pages.Abp.MultiTenancy |
|
|
|
LocalizationResourceType = typeof(AbpUiMultiTenancyResource); |
|
|
|
} |
|
|
|
|
|
|
|
public async Task OnGetAsync() |
|
|
|
public virtual async Task OnGetAsync() |
|
|
|
{ |
|
|
|
Input = new TenantInfoModel(); |
|
|
|
|
|
|
|
@ -39,7 +39,7 @@ namespace Pages.Abp.MultiTenancy |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public async Task OnPostAsync() |
|
|
|
public virtual async Task OnPostAsync() |
|
|
|
{ |
|
|
|
Guid? tenantId = null; |
|
|
|
if (!Input.Name.IsNullOrEmpty()) |
|
|
|
|