Merge pull request #10261 from abpframework/auto-merge/rel-5-0/576

Merge branch dev with rel-5.0
pull/10272/head
maliming 4 years ago committed by GitHub
commit 60000137ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -44,6 +44,7 @@ export interface IdentityUserCreateOrUpdateDtoBase extends ExtensibleObject {
surname?: string;
email: string;
phoneNumber?: string;
isActive: boolean;
lockoutEnabled: boolean;
roleNames: string[];
}
@ -57,6 +58,7 @@ export interface IdentityUserDto extends ExtensibleFullAuditedEntityDto<string>
emailConfirmed: boolean;
phoneNumber?: string;
phoneNumberConfirmed: boolean;
isActive: boolean;
lockoutEnabled: boolean;
lockoutEnd?: string;
concurrencyStamp?: string;

@ -47,6 +47,13 @@ export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany<IdentityUserD
id: 'phone-number',
validators: () => [Validators.maxLength(16)],
},
{
type: ePropType.Boolean,
name: 'isActive',
displayName: 'AbpIdentity::DisplayName:IsActive',
id: 'active-checkbox',
defaultValue: true,
},
{
type: ePropType.Boolean,
name: 'lockoutEnabled',

Loading…
Cancel
Save