diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
index 642bede8d6..f01681e69f 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
@@ -71,6 +71,7 @@
"Volo.Abp.Identity:010007": "You can't change your two factor setting.",
"Volo.Abp.Identity:010008": "It's not allowed to change two factor setting.",
"Identity.OrganizationUnit.MaxUserMembershipCount": "Maximum allowed organization unit membership count for a user",
+ "ThisUserIsNotActiveMessage": "This user is not active.",
"Permission:IdentityManagement": "Identity management",
"Permission:RoleManagement": "Role management",
"Permission:Create": "Create",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
index aa69206ddb..57ad76d5ef 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
@@ -69,6 +69,7 @@
"Volo.Abp.Identity:010003": "Kimliği dışarıdan alınan kullanıcıların şifresi değiştirilemez!",
"Volo.Abp.Identity:010004": "{0} isminde bir birim zaten var. Aynı seviyede aynı isimli iki birim olamaz.",
"Identity.OrganizationUnit.MaxUserMembershipCount": "Bir kullanıcı için izin verilen en fazla organizasyon birimi sayısı",
+ "ThisUserIsNotActiveMessage": "Bu kullanıcı aktif değil.",
"Permission:IdentityManagement": "Kimlik yönetimi",
"Permission:RoleManagement": "Rol yönetimi",
"Permission:Create": "Oluşturma",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json
index 35fae96839..4e70855f26 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json
@@ -71,6 +71,7 @@
"Volo.Abp.Identity:010007": "你不能修改你的双因素身份验证设置",
"Volo.Abp.Identity:010008": "不允许修改双因素身份验证设置.",
"Identity.OrganizationUnit.MaxUserMembershipCount": "组织单位最大允许的成员资格计数",
+ "ThisUserIsNotActiveMessage": "该用户不可用.",
"Permission:IdentityManagement": "身份标识管理",
"Permission:RoleManagement": "角色管理",
"Permission:Create": "创建",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json
index 06f72cd5d0..7ee45887ca 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json
@@ -71,6 +71,7 @@
"Volo.Abp.Identity:010007": "你不能修改你的雙因素身份驗證設置",
"Volo.Abp.Identity:010008": "不允許修改雙因素身份驗證設置.",
"Identity.OrganizationUnit.MaxUserMembershipCount": "允許一個使用者至多可隸屬在幾個組織單位",
+ "ThisUserIsNotActiveMessage": "該用戶不可用.",
"Permission:IdentityManagement": "身份識別管理",
"Permission:RoleManagement": "角色管理",
"Permission:Create": "建立",
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js
index e82aa94f3b..28e7581cb1 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js
@@ -60,7 +60,7 @@
_dataTable.ajax.reload();
});
},
- }
+ }
]
);
}
@@ -79,6 +79,17 @@
{
title: l('UserName'),
data: 'userName',
+ render: function (data, type, row) {
+ row.userName = $.fn.dataTable.render.text().display(row.userName);
+ if (!row.isActive) {
+ return ' ' +
+ '' + row.userName + '';
+ }
+
+ return row.userName;
+ }
},
{
title: l('EmailAddress'),
@@ -93,7 +104,7 @@
},
0 //adds as the first contributor
);
-
+
$(function () {
var _$wrapper = $('#IdentityUsersWrapper');
var _$table = _$wrapper.find('table');
diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts
index 73235215ba..1cc121a89b 100644
--- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts
+++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts
@@ -1,5 +1,7 @@
+import { LocalizationService } from '@abp/ng.core';
import { IdentityUserDto } from '@abp/ng.identity/proxy';
import { EntityProp, ePropType } from '@abp/ng.theme.shared/extensions';
+import { of } from 'rxjs';
export const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany([
{
@@ -8,6 +10,20 @@ export const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany
displayName: 'AbpIdentity::UserName',
sortable: true,
columnWidth: 250,
+ valueResolver: data => {
+ const l10n = data.getInjected(LocalizationService);
+ const t = l10n.instant.bind(l10n);
+
+ const inactiveIcon = ``;
+
+ return of(
+ `
+ ${!data.record.isActive ? inactiveIcon : ''}
+ ${data.record.userName}`,
+ );
+ },
},
{
type: ePropType.String,