Browse Source
Merge pull request #307 from colinin/4.4
fix: add missing localized text
pull/364/head
yx lin
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
189 additions and
187 deletions
-
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN/Abp/IdentityServer/Localization/Resources/en.json
-
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN/Abp/IdentityServer/Localization/Resources/zh-Hans.json
-
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN/Abp/IdentityServer/ApiResources/ApiResourceAppService.cs
|
|
@ -55,6 +55,7 @@ |
|
|
"Name": "Name", |
|
|
"Name": "Name", |
|
|
"DisplayName": "Display Name", |
|
|
"DisplayName": "Display Name", |
|
|
"Description": "Description", |
|
|
"Description": "Description", |
|
|
|
|
|
"Enabled": "Enabled", |
|
|
"Required": "Required", |
|
|
"Required": "Required", |
|
|
"Emphasize": "Emphasize", |
|
|
"Emphasize": "Emphasize", |
|
|
"ShowInDiscoveryDocument": "Show In Discovery Document", |
|
|
"ShowInDiscoveryDocument": "Show In Discovery Document", |
|
|
|
|
|
@ -55,6 +55,7 @@ |
|
|
"Name": "名称", |
|
|
"Name": "名称", |
|
|
"DisplayName": "显示名称", |
|
|
"DisplayName": "显示名称", |
|
|
"Description": "描述", |
|
|
"Description": "描述", |
|
|
|
|
|
"Enabled": "启用", |
|
|
"Required": "必要", |
|
|
"Required": "必要", |
|
|
"Emphasize": "强调", |
|
|
"Emphasize": "强调", |
|
|
"ShowInDiscoveryDocument": "在发现文档中显示", |
|
|
"ShowInDiscoveryDocument": "在发现文档中显示", |
|
|
|
|
|
@ -35,7 +35,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources |
|
|
input.SkipCount, input.MaxResultCount, |
|
|
input.SkipCount, input.MaxResultCount, |
|
|
input.Filter); |
|
|
input.Filter); |
|
|
// 未加Filter过滤器? 结果数不准
|
|
|
// 未加Filter过滤器? 结果数不准
|
|
|
var apiResourceCount = await ApiResourceRepository.GetCountAsync(); |
|
|
var apiResourceCount = await ApiResourceRepository.GetCountAsync(input.Filter); |
|
|
|
|
|
|
|
|
return new PagedResultDto<ApiResourceDto>(apiResourceCount, |
|
|
return new PagedResultDto<ApiResourceDto>(apiResourceCount, |
|
|
ObjectMapper.Map<List<ApiResource>, List<ApiResourceDto>>(apiResources)); |
|
|
ObjectMapper.Map<List<ApiResource>, List<ApiResourceDto>>(apiResources)); |
|
|
|