Browse Source

Merge branch 'rel-5.0' of https://github.com/abpframework/abp into active-ui

pull/10259/head
Mehmet Erim 4 years ago
parent
commit
b8ab85d46d
  1. 1956
      npm/ng-packs/packages/identity/proxy/src/lib/proxy/generate-proxy.json
  2. 2
      npm/ng-packs/packages/identity/proxy/src/lib/proxy/identity/models.ts
  3. 7
      npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts

1956
npm/ng-packs/packages/identity/proxy/src/lib/proxy/generate-proxy.json

File diff suppressed because it is too large

2
npm/ng-packs/packages/identity/proxy/src/lib/proxy/identity/models.ts

@ -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;

7
npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts

@ -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